Merge pull request #1 from ethereumjp/update/ci

Update/ci
ethereumjp · Mar 1, 2024 · 4568a8f · 4568a8f
2 parents c77f2fa + aa48ae6
commit 4568a8f
Show file tree

Hide file tree

Showing 9 changed files with 1,175 additions and 1,080 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -25,14 +25,7 @@
     {
       "groupName": "linters",
       "extends": ["packages:linters"],
-      "matchPackagePatterns": ["^@typescript-eslint/", "prettier", "stylelint"],
-      "automerge": true,
-      "major": { "automerge": false }
-    },
-    {
-      "groupName": "storybook",
-      "extends": ["monorepo:storybook"],
-      "matchPackagePatterns": ["^@storybook/", "^storybook-"],
+      "matchPackagePatterns": ["^@typescript-eslint/", "biome", "stylelint"],
       "automerge": true,
       "major": { "automerge": false }
     }

diff --git a/.github/workflows/_ci.yml → .github/workflows/_setup.yml b/.github/workflows/_ci.yml → .github/workflows/_setup.yml
@@ -1,14 +1,14 @@
 on: workflow_call
 
 jobs:
-  setup:
+  install:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
-      - uses: actions/cache@v3
+          node-version: 20.x
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: |
@@ -21,10 +21,10 @@ jobs:
 
   check:
     runs-on: ubuntu-latest
-    needs: setup
+    needs: install
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ${{ github.workspace }}/node_modules

diff --git a/.github/workflows/ci.yml → .github/workflows/build.yml b/.github/workflows/ci.yml → .github/workflows/build.yml
@@ -1,25 +1,25 @@
-name: check
+name: CI
 
 on:
   push:
-    branches: "!main"
+    branches-ignore: main
 
 jobs:
-  ci:
-    uses: ./.github/workflows/_ci.yml
+  setup:
+    uses: ./.github/workflows/_setup.yml
 
   build:
     runs-on: ubuntu-latest
-    needs: ci
+    needs: setup
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ${{ github.workspace }}/node_modules
             ${{ github.workspace }}/.yarn/cache
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-nodemodules
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: build-cache
         with:
           path: ${{ github.workspace }}/.next/cache
@@ -28,8 +28,6 @@ jobs:
       - name: Run build
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: yarn turbo build
-        env:
-          NODE_ENV: development
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,31 +2,22 @@ name: Deploy site
 
 on:
   push:
-    branches: [main]
+    branches: main
   workflow_dispatch:
 
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
 jobs:
   ci:
     uses: ./.github/workflows/_ci.yml
 
-  build:
+  build-page:
     runs-on: ubuntu-latest
     needs: ci
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/configure-pages@v3
+      - uses: actions/checkout@v4
+      - uses: actions/configure-pages@v4
         with:
           static_site_generator: next
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ${{ github.workspace }}/node_modules
@@ -38,7 +29,7 @@ jobs:
           NODE_ENV: production
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./out
 
@@ -47,8 +38,17 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-    needs: build
+    needs: build-page
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
diff --git a/next.config.js b/next.config.js
@@ -2,8 +2,7 @@
 
 const nextConfig = {
   reactStrictMode: true,
-  basePath: process.env.NODE_ENV === "production" ? "/site" : "",
-  // i18n: { locales: ['en', 'ja'], defaultLocale: 'en', localeDetection: false },
+  i18n: { locales: ["en", "ja"], defaultLocale: "en", localeDetection: false },
   compiler: {
     emotion: true,
   },

diff --git a/src/components/organisms/Schedule.tsx b/src/components/organisms/Schedule.tsx
@@ -1,8 +1,8 @@
 import { brand } from "@/themes/settings/color";
 import { css } from "@emotion/react";
 import Image from "next/image";
+import seikaiha from "public/images/seikaiha.png";
 import EJLogoFace from "public/logo/EJLogoFace.png";
-import seikaiha from "public/seikaiha.png";
 import { Socials } from "./Socials";
 
 const ScheduleSection = () => {

diff --git a/src/locales/en.ts b/src/locales/en.ts
@@ -3,7 +3,7 @@ export const en = {
   MENU: {
     ABOUT: "About",
     EVENTS: "Events",
-    LANGUAGE: "🇯🇵",
+    LANGUAGE: "日本語",
   },
   FORM: {
     NAME: "Name*",

diff --git a/src/locales/ja.ts b/src/locales/ja.ts
@@ -3,7 +3,7 @@ export const ja = {
   MENU: {
     ABOUT: "EthJPについて",
     EVENTS: "イベント",
-    LANGUAGE: "English",
+    LANGUAGE: "🇬🇧",
   },
   FORM: {
     NAME: "名前*",