From cd3afa83b8b173cb548eceb4e80526c8500f26d3 Mon Sep 17 00:00:00 2001 From: Yamashou <1230124fw@gmail.com> Date: Thu, 9 Nov 2023 19:37:35 +0900 Subject: [PATCH 1/4] update --- .github/workflows/docker-publish.yml | 4 ++-- {20230822 => 20231109}/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename {20230822 => 20231109}/Dockerfile (96%) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 64eda80..1d18840 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [20230822, 20231013] + version: [20231013, 20231109] steps: - uses: actions/checkout@v3 @@ -28,7 +28,7 @@ jobs: strategy: matrix: - version: [20230822, 20231013] + version: [20231013, 20231109] steps: - uses: actions/checkout@v3 diff --git a/20230822/Dockerfile b/20231109/Dockerfile similarity index 96% rename from 20230822/Dockerfile rename to 20231109/Dockerfile index b632080..286f587 100644 --- a/20230822/Dockerfile +++ b/20231109/Dockerfile @@ -30,7 +30,7 @@ RUN set -eux && \ go install mvdan.cc/gofumpt@latest && \ go install github.com/daixiang0/gci@latest && \ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2 && \ - go install github.com/Yamashou/gqlgenc@v0.13.5 && \ + go install github.com/Yamashou/gqlgenc@v0.16.0 && \ go install github.com/gqlgo/nodecheck/cmd/nodecheck@v1.0.1 && \ go install github.com/gqlgo/deprecatedquery/cmd/deprecatedquery@v0.0.3 && \ go install github.com/gqlgo/optionalschema/cmd/optionalschema@v0.0.2 && \ From 74647370978741ff7a52877a7ed8283e6056c054 Mon Sep 17 00:00:00 2001 From: Yamashou <1230124fw@gmail.com> Date: Thu, 9 Nov 2023 20:17:04 +0900 Subject: [PATCH 2/4] fix --- 20231018/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/20231018/Dockerfile b/20231018/Dockerfile index 3ee792e..7ca7c99 100644 --- a/20231018/Dockerfile +++ b/20231018/Dockerfile @@ -30,11 +30,7 @@ RUN set -eux && \ go install mvdan.cc/gofumpt@latest && \ go install github.com/daixiang0/gci@latest && \ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2 && \ -<<<<<<<< HEAD:20231109/Dockerfile go install github.com/Yamashou/gqlgenc@v0.16.0 && \ -======== - go install github.com/Yamashou/gqlgenc@v0.15.1 && \ ->>>>>>>> af2ecd9dba0c6d21e183482a8597a763ddf81971:20231018/Dockerfile go install github.com/gqlgo/nodecheck/cmd/nodecheck@v1.0.1 && \ go install github.com/gqlgo/deprecatedquery/cmd/deprecatedquery@v0.0.3 && \ go install github.com/gqlgo/optionalschema/cmd/optionalschema@v0.0.2 && \ From 1f3ee3a95e5e3c91e2fdee13bf1b3c60fb892445 Mon Sep 17 00:00:00 2001 From: Yamashou <1230124fw@gmail.com> Date: Thu, 9 Nov 2023 20:19:08 +0900 Subject: [PATCH 3/4] fix --- 20231109/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/20231109/Dockerfile b/20231109/Dockerfile index 3ee792e..7ca7c99 100644 --- a/20231109/Dockerfile +++ b/20231109/Dockerfile @@ -30,11 +30,7 @@ RUN set -eux && \ go install mvdan.cc/gofumpt@latest && \ go install github.com/daixiang0/gci@latest && \ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2 && \ -<<<<<<<< HEAD:20231109/Dockerfile go install github.com/Yamashou/gqlgenc@v0.16.0 && \ -======== - go install github.com/Yamashou/gqlgenc@v0.15.1 && \ ->>>>>>>> af2ecd9dba0c6d21e183482a8597a763ddf81971:20231018/Dockerfile go install github.com/gqlgo/nodecheck/cmd/nodecheck@v1.0.1 && \ go install github.com/gqlgo/deprecatedquery/cmd/deprecatedquery@v0.0.3 && \ go install github.com/gqlgo/optionalschema/cmd/optionalschema@v0.0.2 && \ From 0f8aeca32df95847a395e1fd1e3a2856f94ec03e Mon Sep 17 00:00:00 2001 From: Yamashou <1230124fw@gmail.com> Date: Thu, 9 Nov 2023 20:21:21 +0900 Subject: [PATCH 4/4] delete --- 20231018/Dockerfile | 47 --------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 20231018/Dockerfile diff --git a/20231018/Dockerfile b/20231018/Dockerfile deleted file mode 100644 index 7ca7c99..0000000 --- a/20231018/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM gcr.io/google.com/cloudsdktool/cloud-sdk:slim - -ARG GOLANG_VERSION=1.21.0 -ARG GOLANG_DOWNLOAD_SHA256=d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742 - -ARG GOPATH=/go -ENV GOPATH=${GOPATH} \ - PATH=/go/bin:/usr/local/go/bin:$PATH - -RUN set -eux && \ - # 基本ツール - apt-get update && \ - apt-get install -yqq --no-install-suggests --no-install-recommends \ - libc6-dev \ - make \ - unzip \ - npm \ - dnsutils && \ - rm -rf /var/lib/apt/lists/* && \ - \ - # Go - curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \ - echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \ - tar -C /usr/local -xzf go.tgz && \ - rm go.tgz && \ - mkdir ${GOPATH} && \ - \ - # 各種ツール - go install golang.org/x/tools/cmd/goimports@latest && \ - go install mvdan.cc/gofumpt@latest && \ - go install github.com/daixiang0/gci@latest && \ - go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2 && \ - go install github.com/Yamashou/gqlgenc@v0.16.0 && \ - go install github.com/gqlgo/nodecheck/cmd/nodecheck@v1.0.1 && \ - go install github.com/gqlgo/deprecatedquery/cmd/deprecatedquery@v0.0.3 && \ - go install github.com/gqlgo/optionalschema/cmd/optionalschema@v0.0.2 && \ - go install github.com/gqlgo/operationname/cmd/operationname@v0.0.1 && \ - go install github.com/gqlgo/iddirective/cmd/iddirective@v0.0.1 && \ - go install github.com/builtbystack/nopermission/cmd/nopermission@v0.0.2 && \ - go install mvdan.cc/sh/v3/cmd/shfmt@latest && \ - go install github.com/google/yamlfmt/cmd/yamlfmt@latest && \ - go install github.com/google/ko@v0.12.0 && \ - go install github.com/sonatard/runenv@latest && \ - rm -rf ${GOPATH}/src ${GOPATH}/pkg && \ - \ - # Artifact RegistryにPushするための認証設定 - gcloud auth configure-docker asia-northeast1-docker.pkg.dev