Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: update Go to 1.20 #1148

Merged
merged 5 commits into from
Jul 2, 2023
Merged

build: update Go to 1.20 #1148

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4bef029
build: update Go to 1.19
hiddeco Nov 21, 2022
83f459b
build: update Go to 1.20
hiddeco Feb 27, 2023
9196a11
build: update GitHub workflow actions
hiddeco Feb 27, 2023
ec06248
build: bump Alpine Dockerfile to 3.18
hiddeco Jul 2, 2023
67bd286
build: bump Go version in `go.mod` to 1.19
hiddeco Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ jobs:
steps:
- name: Install dependencies
run: sudo apt-get update && sudo apt-get install git -y
- name: Set up Go 1.18
uses: actions/setup-go@v2
- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: 1.18
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') }}
Expand All @@ -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 }}
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ 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
uses: actions/setup-go@v2
- name: Set up Go 1.20
uses: actions/setup-go@v3
with:
go-version: 1.18
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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18
FROM golang:1.20

COPY . /go/src/go.mozilla.org/sops
WORKDIR /go/src/go.mozilla.org/sops
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18-alpine3.16 AS builder
FROM golang:1.20-alpine3.18 AS builder

RUN apk --no-cache add make

Expand All @@ -8,7 +8,7 @@ WORKDIR /go/src/go.mozilla.org/sops
RUN CGO_ENABLED=1 make install


FROM alpine:3.15
FROM alpine:3.18

RUN apk --no-cache add \
vim ca-certificates
Expand Down