diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index c18434ba8660..e2a0dc400843 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v2 @@ -65,7 +65,7 @@ jobs: - name: Set outputs id: set - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | const yaml = require('js-yaml'); @@ -119,14 +119,23 @@ jobs: include: ${{ fromJson(needs.prepare.outputs.includes) }} steps: - - name: Environment variables + name: Prepare run: | for l in "${{ inputs.env }}"; do echo "${l?}" >> $GITHUB_ENV done + echo "TEST_REPORT_NAME=${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.kind }}-${{ matrix.worker }}-${{ matrix.tags }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV + testFlags="${{ env.TESTFLAGS }}" + if [ -n "${{ matrix.tags }}" ]; then + testFlags="${testFlags} --tags=${{ matrix.tags }}" + fi + if [ -n "${{ matrix.worker }}" ]; then + testFlags="${testFlags} --run=//worker=${{ matrix.worker }}$" + fi + echo "TESTFLAGS=${testFlags}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v2 @@ -144,16 +153,9 @@ jobs: name: Test continue-on-error: ${{ matrix.tags == 'nydus' }} run: | - export TEST_REPORT_SUFFIX=-${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.kind }}-${{ matrix.worker }}-${{ matrix.tags }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]') - if [ -n "${{ matrix.tags }}" ]; then - TESTFLAGS="${TESTFLAGS} --tags=${{ matrix.tags }}" - export BUILDKITD_TAGS="${{ matrix.tags }}" - fi - if [ -n "${{ matrix.worker }}" ]; then - export TESTFLAGS="${TESTFLAGS} --run=//worker=${{ matrix.worker }}$" - fi ./hack/test ${{ matrix.kind }} env: + TEST_REPORT_SUFFIX: -${{ env.TEST_REPORT_NAME }} TEST_COVERAGE: 1 TESTPKGS: ${{ matrix.pkg }} SKIP_INTEGRATION_TESTS: ${{ matrix.skip-integration-tests }} @@ -161,14 +163,14 @@ jobs: - name: Send to Codecov if: always() - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: directory: ./bin/testreports flags: ${{ matrix.codecov_flags }} - name: Generate annotations if: always() - uses: crazy-max/.github/.github/actions/gotest-annotations@5af0882e0496d2f7e98a53ae4048e3d86682496f + uses: crazy-max/.github/.github/actions/gotest-annotations@fa6141aedf23596fb8bdcceab9cce8dadaa31bd9 with: directory: ./bin/testreports - @@ -176,5 +178,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: test-reports + name: test-reports-${{ env.TEST_REPORT_NAME }} path: ./bin/testreports diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 11ebda6e0cc6..638ff56eef59 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -62,7 +62,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Prepare id: prep @@ -105,7 +105,7 @@ jobs: echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - @@ -134,7 +134,7 @@ jobs: name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: buildkit + name: buildkit-${{ env.PLATFORM_PAIR }} path: ${{ env.DESTDIR }}/* if-no-files-found: error @@ -152,7 +152,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v2 @@ -195,8 +195,9 @@ jobs: name: Download artifacts uses: actions/download-artifact@v4 with: - name: buildkit path: ${{ env.DESTDIR }} + pattern: buildkit-* + merge-multiple: true - name: List artifacts run: | diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index 2d208a78de87..6d4c354bd8a0 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -7,7 +7,7 @@ on: version: description: 'Docker version' required: true - default: '23.0.1' + default: '25.0.2' env: SETUP_BUILDX_VERSION: "latest" @@ -20,10 +20,10 @@ jobs: steps: - name: Prepare - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | - const version = `${{ inputs.version }}` || '23.0.1'; + const version = `${{ inputs.version }}` || '25.0.2'; let build = 'true'; try { new URL(version); @@ -42,7 +42,7 @@ jobs: - name: Build if: ${{ env.DOCKER_BUILD == 'true' }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: context: ${{ env.DOCKER_VERSION }} target: binary @@ -93,7 +93,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v2 diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 564123597ca2..2cf680eb6b58 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -93,7 +93,7 @@ jobs: fi - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v2 diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 95d73b861d44..540ee949bc4a 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -37,13 +37,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: "${{ env.GO_VERSION }}" - cache: true - name: Install gotestsum run: | @@ -67,7 +66,7 @@ jobs: - name: Send to Codecov if: always() - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: directory: ./bin/testreports env_vars: RUNNER_OS @@ -75,7 +74,7 @@ jobs: - name: Generate annotations if: always() - uses: crazy-max/.github/.github/actions/gotest-annotations@5af0882e0496d2f7e98a53ae4048e3d86682496f + uses: crazy-max/.github/.github/actions/gotest-annotations@fa6141aedf23596fb8bdcceab9cce8dadaa31bd9 with: directory: ./bin/testreports - @@ -83,5 +82,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: test-reports + name: test-reports-${{ matrix.os }} path: ./bin/testreports diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index cf0df081cea2..24e8cffb0d0f 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Matrix id: targets @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/client/client_test.go b/client/client_test.go index 8af20e2f22fc..caf8d49d01f2 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -5404,6 +5404,7 @@ func testBasicInlineCacheImportExport(t *testing.T, sb integration.Sandbox) { } func testBasicGhaCacheImportExport(t *testing.T, sb integration.Sandbox) { + t.Skipf("Unsupported GHA cache v2 (v1 is EOL)") integration.CheckFeatureCompat(t, sb, integration.FeatureCacheExport, integration.FeatureCacheImport,