Merge pull request #1125 from traPtitech/main

releaseにmergeできるかのテスト
traPtitech · Oct 29, 2023 · aa6d40a · aa6d40a
2 parents 5e9863e + a28c7a4
commit aa6d40a
Show file tree

Hide file tree

Showing 28 changed files with 13,957 additions and 21,767 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,12 +3,12 @@ updates:
 - package-ecosystem: gomod
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
   open-pull-requests-limit: 10
 - package-ecosystem: docker
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: alpine
@@ -27,7 +27,7 @@ updates:
 - package-ecosystem: docker
   directory: "/docker/dev"
   schedule:
-    interval: daily
+    interval: weekly
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: golang
@@ -40,7 +40,7 @@ updates:
 - package-ecosystem: docker
   directory: "/docker/staging"
   schedule:
-    interval: daily
+    interval: weekly
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: golang
@@ -53,7 +53,7 @@ updates:
 - package-ecosystem: docker
   directory: "/docker/tuning"
   schedule:
-    interval: daily
+    interval: weekly
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: golang
@@ -66,5 +66,5 @@ updates:
 - package-ecosystem: github-actions
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
   open-pull-requests-limit: 10
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,11 +15,11 @@ jobs:
     name: Mod
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.17
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v2.1.7
+          go-version: '1.20'
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3.3.2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
@@ -31,17 +31,17 @@ jobs:
     env:
       GOCACHE: "/tmp/go/cache"
     steps:
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.17
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v2.1.7
+          go-version: '1.20'
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3.3.2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-gomod-
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3.3.2
         with:
           path: /tmp/go/cache
           key: ${{ runner.os }}-go-build-${{ github.ref }}-${{ github.sha }}
@@ -66,11 +66,11 @@ jobs:
           MYSQL_ROOT_PASSWORD: password
           MYSQL_DATABASE: anke-to
     steps:
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.17
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v2.1.7
+          go-version: '1.20'
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3.3.2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
@@ -85,7 +85,7 @@ jobs:
           MARIADB_HOSTNAME: 127.0.0.1
           MARIADB_DATABASE: anke-to
       - name: Upload coverage data
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3.1.4
         with:
           file: ./coverage.txt
           yml: ./codecov.yml
@@ -97,12 +97,12 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v1
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.17
-      - uses: actions/checkout@v3
+          go-version: '1.20'
+      - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: reviewdog/action-golangci-lint@v2.1
+        uses: reviewdog/action-golangci-lint@v2.3
         with:
           reporter: github-pr-check
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -111,9 +111,9 @@ jobs:
     name: Spectral
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Spectral checks
-        uses: stoplightio/[email protected].1
+        uses: stoplightio/[email protected].7
         with:
           file_glob: docs/swagger/*.yaml
           repo_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -14,19 +14,19 @@ jobs:
     name: Build Docker Image (master)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Log in to GitHub Docker Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: traPtitech
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,19 +13,19 @@ jobs:
     name: Build Docker Image
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Log in to GitHub Docker Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: traPtitech
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.3.0
 
 # build backend
-FROM golang:1.17.6-alpine as server-build
+FROM golang:1.20.7-alpine as server-build
 RUN --mount=type=cache,target=/var/cache/apk \
   apk add --update git
 
@@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/github.com/traPtitech/anke-to/client/node_modules
 
 
 # run
-FROM alpine:3.15.0
+FROM alpine:3.18.2
 WORKDIR /app
 
 RUN apk --update --no-cache add tzdata \