Skip to content

Commit

Permalink
uses @phila/pinboard 2.0.100, uses new caching push
Browse files Browse the repository at this point in the history
  • Loading branch information
ajrothwell committed Jan 8, 2025
1 parent bd9cc50 commit c07082a
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 61 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/testing_cache_and_push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Caching with npm

on:
push:
branches:
- vue3-pinboard

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Cache node modules
id: cache-npm
uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
name: List the state of node modules
continue-on-error: true
run: npm list

- name: Install dependencies
run: |
printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc
npm ci
npm list
env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FA_AUTH_TOKEN }}

- name: Build
run: npm run build:testing

- name: Deploy to Dev s3, Set index headers
env:
AWS_DEFAULT_REGION: 'us-east-1'
AWS_S3_BUCKET: phila-resource-finder-v2/testing/ballot-drop-off/
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: |
aws s3 sync dist s3://$AWS_S3_BUCKET --region us-east-1 --delete
aws s3 cp s3://$AWS_S3_BUCKET s3://$AWS_S3_BUCKET --recursive --exclude "*" --include "*.html" --metadata-directive REPLACE --acl public-read --cache-control max-age=0,no-cache,no-store,must-revalidate,proxy-revalidate,public --expires "0" --content-type "text/html; charset=utf-8"
2 changes: 1 addition & 1 deletion .github/workflows/testing_push_to_s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: testing Push to S3
on:
push:
branches:
- vue3-pinboard
- vue3-pinboard_x

jobs:
build:
Expand Down
86 changes: 43 additions & 43 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.7.1",
"@fortawesome/free-regular-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/pro-light-svg-icons": "^6.6.0",
"@fortawesome/pro-regular-svg-icons": "^6.6.0",
"@fortawesome/pro-solid-svg-icons": "^6.6.0",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/pro-light-svg-icons": "^6.7.2",
"@fortawesome/pro-regular-svg-icons": "^6.7.2",
"@fortawesome/pro-solid-svg-icons": "^6.7.2",
"@phila/phila-ui-core": "^1.0.18",
"@phila/pinboard": "^2.0.95",
"@phila/pinboard": "^2.0.100",
"unplugin-auto-import": "^0.18.3",
"unplugin-vue-router": "^0.10.8",
"vue-i18n": "^11.0.1"
Expand Down
10 changes: 0 additions & 10 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,6 @@ let $config = {
dataSources: {
votingSites,
},
cyclomedia: {
enabled: false,
// measurementAllowed: false,
// popoutAble: true,
// recordingsUrl: 'https://atlas.cyclomedia.com/Recordings/wfs',
// username: process.env.VUE_APP_CYCLOMEDIA_USERNAME,
// password: process.env.VUE_APP_CYCLOMEDIA_PASSWORD,
// apiKey: process.env.VUE_APP_CYCLOMEDIA_API_KEY,
},
markerType: 'circle-marker',
mapLayer: {
id: 'resources',
source: 'resources',
Expand Down

0 comments on commit c07082a

Please sign in to comment.