From 30078e1cfdba49dccf1ebc049ca59f9d01e6f3ed Mon Sep 17 00:00:00 2001 From: Casey Callendrello Date: Mon, 15 Jul 2024 16:53:23 +0200 Subject: [PATCH 1/2] .github: fix double-triggering CI We were accidentally running CI twice. Signed-off-by: Casey Callendrello --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 15fac8f62..64c513177 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,7 +1,8 @@ --- name: test -on: ["push", "pull_request"] +on: + pull_request: {} env: GO_VERSION: "1.22" From 675ca92261c95c2bf4c3565f5aa3fb019850eb48 Mon Sep 17 00:00:00 2001 From: Casey Callendrello Date: Mon, 15 Jul 2024 16:58:48 +0200 Subject: [PATCH 2/2] test: bump go version We were using the go.mod version, which we don't change as frequently. Switch to use the GO_VERSION defined in the workflow file. Signed-off-by: Casey Callendrello --- .github/workflows/test.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 64c513177..391e3a113 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,6 +5,7 @@ on: pull_request: {} env: + # be sure to update the version in release.yaml too GO_VERSION: "1.22" LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le riscv64" @@ -17,7 +18,7 @@ jobs: - name: setup go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - uses: ibiqlik/action-yamllint@v3 with: format: auto @@ -35,7 +36,7 @@ jobs: - name: setup go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - name: Build on all supported architectures run: | set -e @@ -59,7 +60,7 @@ jobs: - name: setup go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - name: Set up Go for root run: | sudo ln -sf `which go` `sudo which go` || true @@ -90,6 +91,6 @@ jobs: - name: setup go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - name: test run: bash ./test_windows.sh