Skip to content

Merge v0.12 branch from moby/buildkit #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corhere merged 9 commits into from
Jul 9, 2026
Merged

Merge v0.12 branch from moby/buildkit #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da6e875
ci: update github actions to latest stable
crazy-max Sep 5, 2023
2896fef
ci(dockerd): bump docker to 25.0.2
crazy-max Feb 1, 2024
44a211f
ci: bump actions/github-script to v7
crazy-max Feb 1, 2024
c34f9ba
ci: bump codecov/codecov-action to v4
crazy-max Feb 1, 2024
4b3e70d
ci: bump actions/upload-artifact and actions/download-artifact to 4
crazy-max Feb 1, 2024
295439b
ci: bump gotest-annotations to fa6141aedf23596fb8bdcceab9cce8dadaa31bd9
crazy-max Feb 1, 2024
9d9334b
ci: skip testBasicGhaCacheImportExport test
aepifanov Apr 18, 2025
b10aeed
Merge pull request #5928 from aepifanov/gha-update
crazy-max Apr 22, 2025
b137d28
Fix docker-containerd integration test failures
corhere Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions .github/workflows/.test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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');
Expand Down Expand Up @@ -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
Expand All @@ -144,37 +153,30 @@ 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 }}
CACHE_FROM: type=gha,scope=${{ inputs.cache_scope }}
-
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
-
name: Upload test reports
if: always()
uses: actions/upload-artifact@v4
with:
name: test-reports
name: test-reports-${{ env.TEST_REPORT_NAME }}
path: ./bin/testreports
11 changes: 6 additions & 5 deletions .github/workflows/buildkit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Prepare
id: prep
Expand Down Expand Up @@ -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
-
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/dockerd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
version:
description: 'Docker version'
required: true
default: '23.0.1'
default: '25.0.2'

env:
SETUP_BUILDX_VERSION: "latest"
Expand All @@ -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);
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/test-os.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -67,21 +66,21 @@ 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
flags: unit
-
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
-
name: Upload test reports
if: always()
uses: actions/upload-artifact@v4
with:
name: test-reports
name: test-reports-${{ matrix.os }}
path: ./bin/testreports
4 changes: 2 additions & 2 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Matrix
id: targets
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading