Skip to content

Commit

Permalink
Merge 57a2863 into 89265a6
Browse files Browse the repository at this point in the history
  • Loading branch information
tubone24 committed Mar 15, 2024
2 parents 89265a6 + 57a2863 commit 69f0716
Show file tree
Hide file tree
Showing 19 changed files with 6,597 additions and 6,468 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/common-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> "${GITHUB_OUTPUT}"
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- uses: denoland/setup-deno@v1
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down Expand Up @@ -321,7 +321,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: yarn build
Expand Down Expand Up @@ -376,7 +376,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Install lighthouse
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/owaspzap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down
34 changes: 19 additions & 15 deletions .github/workflows/previewDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> "${GITHUB_OUTPUT}"
Expand All @@ -50,14 +50,14 @@ jobs:
run: yarn install --frozen-lockfile
# create-cache-e2e:
# runs-on: ubuntu-latest
# container: cypress/browsers:node18.12.1-chrome107-ff106-edge
# container: cypress/browsers:node18.17.0-chrome107-ff106-edge
# steps:
# - name: Checkout source code
# uses: actions/checkout@v3
# - name: Setup Node
# uses: actions/setup-node@v3
# with:
# node-version: 18.12.1
# node-version: 18.17.0
# - name: Get yarn cache directory path
# id: yarn-cache-dir-path
# run: echo "dir=$(yarn cache dir)" >> "${GITHUB_OUTPUT}"
Expand All @@ -84,7 +84,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- uses: denoland/setup-deno@v1
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
run: deno run --allow-env --allow-read --allow-net scripts/uploadScreenShot.ts
# test-e2e-chrome:
# runs-on: ubuntu-latest
# container: cypress/browsers:node18.12.1-chrome107-ff106-edge
# container: cypress/browsers:node18.17.0-chrome107-ff106-edge
# steps:
# - name: Checkout source code
# uses: actions/checkout@v3
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
# run: deno run --allow-env --allow-read --allow-net scripts/uploadScreenShot.ts
# test-e2e-firefox:
# runs-on: ubuntu-latest
# container: cypress/browsers:node18.12.1-chrome107-ff106-edge
# container: cypress/browsers:node18.17.0-chrome107-ff106-edge
# steps:
# - name: Checkout source code
# uses: actions/checkout@v3
Expand Down Expand Up @@ -309,7 +309,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down Expand Up @@ -361,7 +361,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down Expand Up @@ -390,7 +390,11 @@ jobs:
FAUNADB_SERVER_SECRET: ${{secrets.FAUNADB_SERVER_SECRET}}
NETLIFY_ENV: deploy-preview
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
run: yarn install --frozen-lockfile
run: |
yarn install --frozen-lockfile
cd functions/src
npm install --os=linux --cpu=x64 --prefix ./ sharp
ls node_modules/
- name: yarn build
env:
GATSBY_GITHUB_CLIENT_SECRET: ${{secrets.GATSBY_GITHUB_CLIENT_SECRET}}
Expand Down Expand Up @@ -430,7 +434,7 @@ jobs:
if: ${{ !contains(needs.check-skip-flags.outputs.head-commit-message, '[skip netlify]') }}
id: get-netlify-draft-url
run: |
echo "draftUrl=$(cat cli.txt | sed -r 's/.*Website Draft URL: (.*)\\n\\nIf everything.*/\1/')" >> "${GITHUB_OUTPUT}"
echo "draftUrl=$(cat cli.txt | sed -r 's/.*Website draft URL: (.*)\\n\\nIf everything.*/\1/')" >> "${GITHUB_OUTPUT}"
- uses: chrnorm/deployment-status@v2
if: ${{ !contains(needs.check-skip-flags.outputs.head-commit-message, '[skip netlify]') && success() }}
name: Create GitHub deploy (Success)
Expand Down Expand Up @@ -463,7 +467,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down Expand Up @@ -528,7 +532,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down Expand Up @@ -591,7 +595,7 @@ jobs:
reviewdog_version: latest
- uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- uses: actions/checkout@v3
Expand Down Expand Up @@ -650,7 +654,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
- name: install dependencies
run: yarn install --frozen-lockfile
- name: yarn build
Expand Down Expand Up @@ -701,7 +705,7 @@ jobs:
if: ${{ !contains(needs.check-skip-flags.outputs.head-commit-message, '[skip netlify]') }}
id: get-netlify-draft-url
run: |
echo "draftUrl=$(cat cli.txt | sed -r 's/.*Website Draft URL: (.*)\\n\\nIf everything.*/\1/')" >> "${GITHUB_OUTPUT}"
echo "draftUrl=$(cat cli.txt | sed -r 's/.*Website draft URL: (.*)\\n\\nIf everything.*/\1/')" >> "${GITHUB_OUTPUT}"
- uses: chrnorm/deployment-status@v2
if: ${{ !contains(needs.check-skip-flags.outputs.head-commit-message, '[skip netlify]') && success() }}
name: Create GitHub deploy (Success)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.12.1
node-version: 18.17.0
registry-url: https://npm.pkg.github.com/
scope: '@tubone24'
- name: Get yarn cache directory path
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ test/memlab/data
owasp/zap/*.key
owasp/zap/*.cer
owasp/zap/zapHome/

# Local Netlify folder
.netlify
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.1
18.17.0
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.1
18.17.0
Binary file added KaiseiTokumin-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file added functions/src/KaiseiTokumin-Bold.ttf
Binary file not shown.
Loading

0 comments on commit 69f0716

Please sign in to comment.