diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4d2cb4..ecbe020 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -652,35 +652,6 @@ jobs: env: DOCKER_BUILD_RECORD_RETENTION_DAYS: ${{ matrix.days }} - export-legacy: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - legacy: - - false - - true - steps: - - - name: Checkout - uses: actions/checkout@v6 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} - driver-opts: | - image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} - - - name: Build - uses: ./ - with: - files: | - ./test/config.hcl - targets: app - env: - DOCKER_BUILD_EXPORT_LEGACY: ${{ matrix.legacy }} - checks: runs-on: ubuntu-latest strategy: diff --git a/README.md b/README.md index 7c1ece2..00d600d 100644 --- a/README.md +++ b/README.md @@ -231,7 +231,6 @@ The following outputs are available | `DOCKER_BUILD_SUMMARY` | Bool | `true` | If `false`, [build summary](https://docs.docker.com/build/ci/github-actions/build-summary/) generation is disabled | | `DOCKER_BUILD_RECORD_UPLOAD` | Bool | `true` | If `false`, build record upload as [GitHub artifact](https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts) is disabled | | `DOCKER_BUILD_RECORD_RETENTION_DAYS` | Number | | Duration after which build record artifact will expire in days. Defaults to repository/org [retention settings](https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy) if unset or `0` | -| `DOCKER_BUILD_EXPORT_LEGACY` | Bool | `false` | If `true`, exports build using legacy export-build tool instead of [`buildx history export` command](https://docs.docker.com/reference/cli/docker/buildx/history/export/) | ## Subactions diff --git a/src/main.ts b/src/main.ts index cfd0fbe..f8035d6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -215,8 +215,8 @@ actionsToolkit.run( core.info(`Build summary skipped for ${inputs.call} subrequest`); } else if (GitHub.isGHES) { core.info('Build summary is not yet supported on GHES'); - } else if (!(await toolkit.buildx.versionSatisfies('>=0.13.0'))) { - core.info('Build summary requires Buildx >= 0.13.0'); + } else if (!(await toolkit.buildx.versionSatisfies('>=0.23.0'))) { + core.info('Build summary requires Buildx >= 0.23.0'); } else if (refs.length == 0) { core.info('Build summary requires at least one build reference'); } else { @@ -242,8 +242,7 @@ actionsToolkit.run( const buildxHistory = new BuildxHistory(); const exportRes = await buildxHistory.export({ - refs: stateHelper.buildRefs, - useContainer: buildExportLegacy() + refs: stateHelper.buildRefs }); core.info(`Build records written to ${exportRes.dockerbuildFilename} (${Util.formatFileSize(exportRes.dockerbuildSize)})`); @@ -341,10 +340,3 @@ function buildRecordRetentionDays(): number | undefined { return res; } } - -function buildExportLegacy(): boolean { - if (process.env.DOCKER_BUILD_EXPORT_LEGACY) { - return Util.parseBool(process.env.DOCKER_BUILD_EXPORT_LEGACY); - } - return false; -}