Skip to content

Commit e25db87

Browse files
authored
Merge pull request #1474 from crazy-max/rm-export-build-tool
remove legacy export-build tool support
2 parents 1ac2573 + 5b9c34f commit e25db87

File tree

5 files changed

+5
-43
lines changed

5 files changed

+5
-43
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,35 +1464,6 @@ jobs:
14641464
env:
14651465
DOCKER_BUILD_RECORD_RETENTION_DAYS: ${{ matrix.days }}
14661466

1467-
export-legacy:
1468-
runs-on: ubuntu-latest
1469-
strategy:
1470-
fail-fast: false
1471-
matrix:
1472-
legacy:
1473-
- false
1474-
- true
1475-
steps:
1476-
-
1477-
name: Checkout
1478-
uses: actions/checkout@v6
1479-
with:
1480-
path: action
1481-
-
1482-
name: Set up Docker Buildx
1483-
uses: docker/setup-buildx-action@v3
1484-
with:
1485-
version: ${{ inputs.buildx-version || env.BUILDX_VERSION }}
1486-
driver-opts: |
1487-
image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }}
1488-
-
1489-
name: Build
1490-
uses: ./action
1491-
with:
1492-
file: ./test/Dockerfile
1493-
env:
1494-
DOCKER_BUILD_EXPORT_LEGACY: ${{ matrix.legacy }}
1495-
14961467
checks:
14971468
runs-on: ubuntu-latest
14981469
strategy:

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ The following outputs are available:
277277
| `DOCKER_BUILD_SUMMARY` | Bool | `true` | If `false`, [build summary](https://docs.docker.com/build/ci/github-actions/build-summary/) generation is disabled |
278278
| `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 |
279279
| `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` |
280-
| `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/) |
281280

282281
## Troubleshooting
283282

dist/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ actionsToolkit.run(
175175
core.info(`Build summary skipped for ${inputs.call} subrequest`);
176176
} else if (GitHub.isGHES) {
177177
core.info('Build summary is not yet supported on GHES');
178-
} else if (!(await toolkit.buildx.versionSatisfies('>=0.13.0'))) {
179-
core.info('Build summary requires Buildx >= 0.13.0');
178+
} else if (!(await toolkit.buildx.versionSatisfies('>=0.23.0'))) {
179+
core.info('Build summary requires Buildx >= 0.23.0');
180180
} else if (!ref) {
181181
core.info('Build summary requires a build reference');
182182
} else {
@@ -202,8 +202,7 @@ actionsToolkit.run(
202202

203203
const buildxHistory = new BuildxHistory();
204204
const exportRes = await buildxHistory.export({
205-
refs: stateHelper.buildRef ? [stateHelper.buildRef] : [],
206-
useContainer: buildExportLegacy()
205+
refs: stateHelper.buildRef ? [stateHelper.buildRef] : []
207206
});
208207
core.info(`Build record written to ${exportRes.dockerbuildFilename} (${Util.formatFileSize(exportRes.dockerbuildSize)})`);
209208

@@ -298,10 +297,3 @@ function buildRecordRetentionDays(): number | undefined {
298297
return res;
299298
}
300299
}
301-
302-
function buildExportLegacy(): boolean {
303-
if (process.env.DOCKER_BUILD_EXPORT_LEGACY) {
304-
return Util.parseBool(process.env.DOCKER_BUILD_EXPORT_LEGACY);
305-
}
306-
return false;
307-
}

0 commit comments

Comments
 (0)