Skip to content

Commit

Permalink
Merge pull request #1260 from traPtitech/main
Browse files Browse the repository at this point in the history
バグ修正のリリース
  • Loading branch information
kaitoyama authored Jul 9, 2024
2 parents 41ab1a8 + d037e89 commit df0a014
Show file tree
Hide file tree
Showing 19 changed files with 758 additions and 747 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
name: Mod
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
- uses: actions/checkout@v4
go-version-file: 'go.mod'
- uses: actions/[email protected]
with:
path: ~/go/pkg/mod
Expand All @@ -31,10 +31,10 @@ jobs:
env:
GOCACHE: "/tmp/go/cache"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
- uses: actions/checkout@v4
go-version-file: 'go.mod'
- uses: actions/[email protected]
with:
path: ~/go/pkg/mod
Expand Down Expand Up @@ -66,10 +66,10 @@ jobs:
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: anke-to
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
- uses: actions/checkout@v4
go-version-file: 'go.mod'
- uses: actions/[email protected]
with:
path: ~/go/pkg/mod
Expand Down Expand Up @@ -97,10 +97,10 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
- uses: actions/checkout@v4
go-version-file: 'go.mod'
- name: golangci-lint
uses: reviewdog/[email protected]
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ mock_*
*.png

# End of https://www.gitignore.io/api/go

.vscode/settings.json
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1.3.0

# build backend
FROM golang:1.20.7-alpine as server-build
FROM golang:1.22.2-alpine as server-build
RUN --mount=type=cache,target=/var/cache/apk \
apk add --update git

Expand Down
2 changes: 1 addition & 1 deletion docker/dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.7-alpine as build-step
FROM golang:1.22.2-alpine as build-step
RUN apk add --update --no-cache ca-certificates git

WORKDIR /go/src/github.com/traPtitech/anke-to
Expand Down
2 changes: 1 addition & 1 deletion docker/staging/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1.3.0

# build backend
FROM golang:1.20.7-alpine as server-build
FROM golang:1.22.2-alpine as server-build
RUN --mount=type=cache,target=/var/cache/apk \
apk add --update git

Expand Down
2 changes: 1 addition & 1 deletion docker/test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.7-alpine as builder
FROM golang:1.22.2-alpine as builder
RUN apk add --update --no-cache ca-certificates git \
&& apk add --no-cache gcc libc-dev \
&& apk add --no-cache openssl
Expand Down
2 changes: 1 addition & 1 deletion docker/tuning/Dockerfile.server
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.7-alpine as build-step
FROM golang:1.22.2-alpine as build-step
RUN apk add --update --no-cache ca-certificates git

WORKDIR /go/src/github.com/traPtitech/anke-to
Expand Down
Loading

0 comments on commit df0a014

Please sign in to comment.