From 1a14fcb1e6645dd92f5a4f2da00071bd59c2e887 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:20:27 +0200 Subject: [PATCH] update gh actions versions, update engine matrix, bump golang to 1.21.11 Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- .github/workflows/ci.yml | 68 +++++++++++++++++------------ .github/workflows/codeql.yml | 2 +- .github/workflows/docs-upstream.yml | 2 +- .github/workflows/merge.yml | 6 +-- Dockerfile | 2 +- 5 files changed, 45 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4a67a3cdd..723f3f5db8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create matrix id: platforms @@ -53,7 +53,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -78,7 +78,7 @@ jobs: echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -96,10 +96,10 @@ jobs: *.cache-to=type=gha,scope=binary-${{ env.PLATFORM_PAIR }},mode=max - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: compose - path: ./bin/release/* + name: compose-${{ env.PLATFORM_PAIR }} + path: ./bin/release if-no-files-found: error test: @@ -107,7 +107,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -121,7 +121,7 @@ jobs: *.cache-to=type=gha,scope=test - name: Gather coverage data - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage-data-unit path: bin/coverage/unit/ @@ -142,14 +142,21 @@ jobs: - standalone engine: - 24.0.9 - - 25.0.4 - - 26.0.0 + - 25.0.5 + - 26.1.4 steps: + - name: Prepare + run: | + mode=${{ matrix.mode }} + engine=${{ matrix.engine }} + echo "MODE_ENGINE_PAIR=${mode}-${engine}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Docker ${{ matrix.engine }} run: | + sudo systemctl stop docker.service + sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras docker-buildx-plugin sudo apt-get install curl curl -fsSL https://get.docker.com -o get-docker.sh sudo sh ./get-docker.sh --version ${{ matrix.engine }} @@ -160,7 +167,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' check-latest: true @@ -193,9 +200,9 @@ jobs: - name: Gather coverage data if: ${{ matrix.mode == 'plugin' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: coverage-data-e2e + name: coverage-data-e2e-${{ env.MODE_ENGINE_PAIR }} path: bin/coverage/e2e/ if-no-files-found: error - @@ -212,34 +219,36 @@ jobs: paths: /tmp/report/report.xml if: always() coverage: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: - test - e2e steps: # codecov won't process the report without the source code available - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' check-latest: true - name: Download unit test coverage - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: coverage-data-unit path: coverage/unit + merge-multiple: true - name: Download E2E test coverage - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: coverage-data-e2e + pattern: coverage-data-e2e-* path: coverage/e2e + merge-multiple: true - name: Merge coverage reports run: | go tool covdata textfmt -i=./coverage/unit,./coverage/e2e -o ./coverage.txt - name: Store coverage report in GitHub Actions - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: go-covdata-txt path: ./coverage.txt @@ -259,16 +268,17 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: compose - path: bin/release + pattern: compose-* + path: ./bin/release + merge-multiple: true - name: Create checksums - working-directory: bin/release + working-directory: ./bin/release run: | find . -type f -print0 | sort -z | xargs -r0 shasum -a 256 -b | sed 's# \*\./# *#' > $RUNNER_TEMP/checksums.txt shasum -a 256 -U -c $RUNNER_TEMP/checksums.txt @@ -276,11 +286,11 @@ jobs: cat checksums.txt | while read sum file; do echo "$sum $file" > ${file#\*}.sha256; done - name: License - run: cp packaging/* bin/release/ + run: cp packaging/* ./bin/release/ - name: List artifacts run: | - tree -nh bin/release + tree -nh ./bin/release - name: Check artifacts run: | @@ -290,7 +300,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37 # v1.10.0 with: - artifacts: bin/release/* + artifacts: ./bin/release/* generateReleaseNotes: true draft: true token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ca2aa3c28f..d915bb8611 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: go.mod check-latest: true diff --git a/.github/workflows/docs-upstream.yml b/.github/workflows/docs-upstream.yml index 39fa1a5869..af9e30104f 100644 --- a/.github/workflows/docs-upstream.yml +++ b/.github/workflows/docs-upstream.yml @@ -21,7 +21,7 @@ on: jobs: docs-yaml: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 14bade4a27..ddbc744334 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -31,9 +31,9 @@ jobs: env: GO111MODULE: "on" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version-file: go.mod cache: true @@ -81,7 +81,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/Dockerfile b/Dockerfile index 863a537850..d04ce27d2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG GO_VERSION=1.21.10 +ARG GO_VERSION=1.21.11 ARG XX_VERSION=1.2.1 ARG GOLANGCI_LINT_VERSION=v1.55.2 ARG ADDLICENSE_VERSION=v1.0.0