From 4bef0297cb54f9796dfbac578fd5f43d4fe342fe Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Mon, 21 Nov 2022 23:30:31 +0000 Subject: [PATCH 1/5] build: update Go to 1.19 This updates Go used for builds to 1.19, and updates a forgotten Alpine 3.15 version in a `Dockerfile` to 3.16. Signed-off-by: Hidde Beydals --- .github/workflows/cli.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- Dockerfile | 2 +- Dockerfile.alpine | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 506db62a4..ccc8cac7d 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -28,10 +28,10 @@ jobs: steps: - name: Install dependencies run: sudo apt-get update && sudo apt-get install git -y - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8d2a78a9..0db9ccf8f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,10 +15,10 @@ jobs: run: sudo apt-get update && sudo apt-get install git ruby rpm -y - name: Install fpm run: gem install fpm || sudo gem install fpm - - name: Set up Go 1.18 + - name: Set up Go 1.19 uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 id: go - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index 8f75f5799..c7c019550 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 +FROM golang:1.19 COPY . /go/src/go.mozilla.org/sops WORKDIR /go/src/go.mozilla.org/sops diff --git a/Dockerfile.alpine b/Dockerfile.alpine index c7d3227ee..a5c66ddf2 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM golang:1.18-alpine3.16 AS builder +FROM golang:1.19-alpine3.16 AS builder RUN apk --no-cache add make @@ -8,7 +8,7 @@ WORKDIR /go/src/go.mozilla.org/sops RUN CGO_ENABLED=1 make install -FROM alpine:3.15 +FROM alpine:3.16 RUN apk --no-cache add \ vim ca-certificates From 83f459b1adfa4d11be0cec433e8edf6ee9366702 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Mon, 27 Feb 2023 22:39:47 +0100 Subject: [PATCH 2/5] build: update Go to 1.20 This updates Go used for builds to 1.20, including an update of Alpine to 3.17. Signed-off-by: Hidde Beydals --- .github/workflows/cli.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- Dockerfile | 2 +- Dockerfile.alpine | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index ccc8cac7d..5042eb61b 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -28,10 +28,10 @@ jobs: steps: - name: Install dependencies run: sudo apt-get update && sudo apt-get install git -y - - name: Set up Go 1.19 - uses: actions/setup-go@v2 + - name: Set up Go 1.20 + uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: '1.20' id: go - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0db9ccf8f..aa5c1202a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,10 +15,10 @@ jobs: run: sudo apt-get update && sudo apt-get install git ruby rpm -y - name: Install fpm run: gem install fpm || sudo gem install fpm - - name: Set up Go 1.19 + - name: Set up Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: '1.20' id: go - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index c7c019550..d0c58a36f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 +FROM golang:1.20 COPY . /go/src/go.mozilla.org/sops WORKDIR /go/src/go.mozilla.org/sops diff --git a/Dockerfile.alpine b/Dockerfile.alpine index a5c66ddf2..de1ab4631 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine3.16 AS builder +FROM golang:1.20-alpine3.17 AS builder RUN apk --no-cache add make @@ -8,7 +8,7 @@ WORKDIR /go/src/go.mozilla.org/sops RUN CGO_ENABLED=1 make install -FROM alpine:3.16 +FROM alpine:3.17 RUN apk --no-cache add \ vim ca-certificates From 9196a11b63e95f9da5696de683bdd6fce8d81ad8 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Mon, 27 Feb 2023 22:47:05 +0100 Subject: [PATCH 3/5] build: update GitHub workflow actions To their respective latest versions. Signed-off-by: Hidde Beydals --- .github/workflows/cli.yml | 12 ++++++------ .github/workflows/release.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 5042eb61b..d9fa04c8e 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -34,8 +34,8 @@ jobs: go-version: '1.20' id: go - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - uses: actions/cache@v2 + uses: actions/checkout@v3 + - uses: actions/cache@v3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -53,13 +53,13 @@ jobs: run: make test - name: Upload artifact for Linux and Darwin if: matrix.os != 'windows' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: sops-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }} path: sops-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }} - name: Upload artifact for Windows if: matrix.os == 'windows' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: sops-${{ matrix.os }}-${{ github.sha }} path: sops-${{ matrix.os }}-${{ github.sha }} @@ -75,8 +75,8 @@ jobs: - name: Install rustup run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain 1.70.0 - name: Check out code - uses: actions/checkout@v2 - - uses: actions/download-artifact@v2 + uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 with: name: sops-linux-amd64-${{ github.sha }} - name: Move SOPS binary diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa5c1202a..86e2ac112 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,12 +16,12 @@ jobs: - name: Install fpm run: gem install fpm || sudo gem install fpm - name: Set up Go 1.20 - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: '1.20' id: go - name: Check out code into the Go module directory - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Go vendor run: go mod vendor - name: Make release directory From ec06248b8e5cba1548b5940f574f0c9f291c7978 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Sun, 2 Jul 2023 11:46:16 +0200 Subject: [PATCH 4/5] build: bump Alpine Dockerfile to 3.18 Signed-off-by: Hidde Beydals --- Dockerfile.alpine | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index de1ab4631..530585240 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine3.17 AS builder +FROM golang:1.20-alpine3.18 AS builder RUN apk --no-cache add make @@ -8,7 +8,7 @@ WORKDIR /go/src/go.mozilla.org/sops RUN CGO_ENABLED=1 make install -FROM alpine:3.17 +FROM alpine:3.18 RUN apk --no-cache add \ vim ca-certificates From 67bd286a04ca8c6ac25e207f6e634c81819e2e42 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Sun, 2 Jul 2023 19:50:29 +0200 Subject: [PATCH 5/5] build: bump Go version in `go.mod` to 1.19 Which is the lowest supported version of Go at the moment. Signed-off-by: Hidde Beydals --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 281a63533..536ba1481 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.mozilla.org/sops/v3 -go 1.18 +go 1.19 require ( cloud.google.com/go/kms v1.4.0