Merge pull request #47 from cognano/fix-deploy

Upgrade react-loader-spinner
cognano · May 29, 2024 · b465dd0 · b465dd0
2 parents d3591bc + 2d5a824
commit b465dd0
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 295 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
       - main
 
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
     types: [completed]
 
 jobs:
-  release:
+  build_and_deployment:
     runs-on: ubuntu-latest
     env:
       NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}
@@ -41,6 +41,7 @@ jobs:
       run: |
         yarn install
         yarn add sharp --ignore-engines
+
     - name: Run next build for english
       run: |
         yarn build
@@ -55,6 +56,7 @@ jobs:
         local-dir: ./out/
         exclude: |
           ogimages/*-ja-*.png
+
     - name: Run next build for japanese
       run: |
         yarn build

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -3,12 +3,14 @@ name: Staging
 on:
   repository_dispatch:
   workflow_dispatch:
+  pull_request:
   workflow_run:
     workflows: ["Build"]
+    branches: [main]
     types: [completed]
 
 jobs:
-  staging:
+  build_and_deployment:
     runs-on: ubuntu-latest
     env:
       NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}
@@ -40,6 +42,7 @@ jobs:
       run: |
         yarn install
         yarn add sharp --ignore-engines
+
     - name: Run next build for english
       run: |
         yarn build
@@ -55,6 +58,7 @@ jobs:
         local-dir: ./out/
         exclude: |
           ogimages/*-ja-*.png
+
     - name: Run next build for japanese
       run: |
         yarn build
@@ -64,7 +68,7 @@ jobs:
     - name: Deploy to stag.cognano.co.jp by FTP
       uses: SamKirkland/[email protected]
       with:
-        server: ${{ secrets.FTPHOST }}
+        server: ${{ secrets.FTP_HOST }}
         username: ${{ secrets.FTP_USER_STAG_JA }}
         password: ${{ secrets.FTP_PASS_STAG_JA }}
         local-dir: ./out/

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "react": "^18.2.0",
     "react-cookie-consent": "^8.0.1",
     "react-dom": "^18.1.0",
-    "react-loader-spinner": "^5.1.5",
+    "react-loader-spinner": "^6.1.6",
     "react-modal": "^3.16.1",
     "rotion": "^1.0.0",
     "schema-dts": "^1.1.2",
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: @@
           - main
     jobs:
-      build:
+      lint:
         runs-on: ubuntu-latest
         strategy:
           matrix:
@@ Expand Down @@