Skip to content

Commit a4cc1c8

Browse files
EraxysoEraxyso
authored
Merge branch 'main' into dependabot/go_modules/github.com/getkin/kin-openapi-0.135.0
2 parents 6b6aa7c + 6a1bbd4 commit a4cc1c8

26 files changed

Lines changed: 161 additions & 186 deletions

‎.github/workflows/deploy.yml‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎.github/workflows/main.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: CI
33
on:
44
push:
55
branches:
6-
- 'main'
7-
- 'develop'
6+
- "main"
7+
- "develop"
88
pull_request:
99

1010
env:
@@ -25,9 +25,8 @@ jobs:
2525
ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
2626
- uses: actions/setup-go@v5
2727
with:
28-
go-version-file: 'go.mod'
29-
- run: go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.5.1
30-
- run: go install github.com/google/wire/cmd/wire@v0.7.0
28+
go-version-file: "go.mod"
29+
- run: go install tool
3130
- run: go generate ./openapi
3231
- run: go generate -run "wire" ./...
3332
- name: Auto-commit generated files
@@ -60,7 +59,7 @@ jobs:
6059
ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
6160
- uses: actions/setup-go@v5
6261
with:
63-
go-version-file: 'go.mod'
62+
go-version-file: "go.mod"
6463
- run: go mod download
6564
build:
6665
name: Build
@@ -72,7 +71,7 @@ jobs:
7271
ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
7372
- uses: actions/setup-go@v5
7473
with:
75-
go-version-file: 'go.mod'
74+
go-version-file: "go.mod"
7675
- run: go build -o anke-to
7776
- uses: actions/upload-artifact@v4
7877
with:
@@ -96,7 +95,7 @@ jobs:
9695
ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
9796
- uses: actions/setup-go@v5
9897
with:
99-
go-version-file: 'go.mod'
98+
go-version-file: "go.mod"
10099
- run: go install go.uber.org/mock/mockgen@v0.6.0
101100
- run: go generate ./model ./traq
102101
- run: go test ./model -v -coverprofile=coverage-model.txt -race -vet=off
@@ -146,7 +145,7 @@ jobs:
146145
ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
147146
- uses: actions/setup-go@v5
148147
with:
149-
go-version-file: 'go.mod'
148+
go-version-file: "go.mod"
150149
- run: go install go.uber.org/mock/mockgen@v0.6.0
151150
- run: go generate ./model ./traq
152151
- name: golangci-lint

‎.github/workflows/release.yml‎

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,58 @@ name: Release
22

33
on:
44
push:
5-
branches:
6-
- release
5+
tags:
6+
- v*.*.*
7+
branches:
8+
- main
9+
10+
permissions:
11+
contents: read
12+
packages: write
713

814
env:
915
IMAGE_NAME: anke-to
1016

1117
jobs:
1218
image:
1319
name: Build Docker Image
14-
runs-on: ubuntu-24.04
20+
runs-on: ubuntu-latest
1521
steps:
16-
- uses: actions/checkout@v4
22+
- name: Set IMAGE_TAG env
23+
run: echo "IMAGE_TAG=$(echo ${GITHUB_REF:11})" >> $GITHUB_ENV
24+
- uses: actions/checkout@v6
1725
- name: Set up QEMU
18-
uses: docker/setup-qemu-action@v3
26+
uses: docker/setup-qemu-action@v4
1927
- name: Set up Docker Buildx
20-
uses: docker/setup-buildx-action@v3
21-
- name: Log in to GitHub Docker Registry
22-
uses: docker/login-action@v3
28+
id: buildx
29+
uses: docker/setup-buildx-action@v4
30+
- name: Show available platforms
31+
run: echo ${{ steps.buildx.outputs.platforms }}
32+
- name: Login to GitHub Container Registry
33+
uses: docker/login-action@v4
2334
with:
2435
registry: ghcr.io
25-
username: traPtitech
36+
username: traptitech
2637
password: ${{ secrets.GITHUB_TOKEN }}
2738
- name: Build and push
28-
uses: docker/build-push-action@v6
39+
uses: docker/build-push-action@v7
2940
with:
3041
context: .
3142
push: true
32-
platforms: linux/amd64,linux/arm64
33-
tags: ghcr.io/traptitech/${{ env.IMAGE_NAME }}:latest
34-
cache-from: type=gha
35-
cache-to: type=gha,mode=max
43+
platforms: linux/amd64
44+
tags: |
45+
ghcr.io/traptitech/${{ env.IMAGE_NAME }}:latest
46+
ghcr.io/traptitech/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
47+
cache-from: type=registry,ref=ghcr.io/traptitech/${{ env.IMAGE_NAME }}:buildcache
48+
49+
run-manifest-renovate:
50+
name: Run Renovate on manifest
51+
runs-on: ubuntu-latest
52+
needs: [image]
53+
permissions:
54+
contents: read
55+
actions: write
56+
steps:
57+
- run: 'gh api --method POST -H "Accept: application/vnd.github+json" /repos/traPtitech/manifest/actions/workflows/renovate.yaml/dispatches -f "ref=main"'
58+
env:
59+
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}

‎docs/swagger/swagger.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
openapi: 3.0.4
22
servers:
3-
- url: "https://anke-to.trap.jp/api"
3+
- url: "http://anke-to.trap.jp/api"
44
description: production
5-
- url: "https://anke-to-dev.trapti.tech/api"
5+
- url: "http://anke-to-dev.trapti.tech/api"
66
description: development
77
- url: "http://anke-to-alpha.trap.show/api"
88
description: alpha (deployed on noeshowcase; actual url is https)

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ require (
6666
)
6767

6868
require (
69-
github.com/deckarep/golang-set/v2 v2.6.0
69+
github.com/deckarep/golang-set/v2 v2.8.0
7070
github.com/go-gormigrate/gormigrate/v2 v2.1.1
7171
github.com/oapi-codegen/echo-middleware v1.0.2
7272
github.com/traPtitech/go-traq v0.0.0-20240420012203-0152d96098b0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
6767
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6868
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6969
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
70-
github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=
71-
github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
70+
github.com/deckarep/golang-set/v2 v2.8.0 h1:swm0rlPCmdWn9mESxKOjWk8hXSqoxOp+ZlfuyaAdFlQ=
71+
github.com/deckarep/golang-set/v2 v2.8.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
7272
github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58=
7373
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w=
7474
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q=

‎model/administratorGroups.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:generate mockgen -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
1+
//go:generate go tool mockgen -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
22

33
package model
44

‎model/administratorUsers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:generate mockgen -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
1+
//go:generate go tool mockgen -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
22

33
package model
44

‎model/administrators.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:generate mockgen -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
1+
//go:generate go tool mockgen -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
22

33
package model
44

‎model/options.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:generate mockgen -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
1+
//go:generate go tool mockgen -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
22

33
package model
44

0 commit comments

Comments
 (0)