Skip to content

chore: pass "on push pr" workflows #6

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
janishorsts merged 14 commits into from
Sep 21, 2025
Merged

chore: pass "on push pr" workflows #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ac5638e
chore: bump bake
janishorsts Sep 19, 2025
7a3ada0
chore: disable gha cache
janishorsts Sep 19, 2025
39b2f1e
chore: try moby/buildkit:latest
janishorsts Sep 20, 2025
502ef4d
chore: restore artifact name
janishorsts Sep 20, 2025
912db84
chore: upload buildkit artifact
janishorsts Sep 20, 2025
d5af27f
chore: try to downgrade upload to v3
janishorsts Sep 20, 2025
56b4535
chore: upgrade upload to v4
janishorsts Sep 20, 2025
5b67fca
chore: set TEST_REPORT_NAME from upstream
janishorsts Sep 20, 2025
5a4df42
fix: download * artifacts
janishorsts Sep 20, 2025
6e844e1
chore: skip freebsd os smoke test
janishorsts Sep 20, 2025
d7c042e
Update .github/workflows/.test.yml
gilescope Sep 21, 2025
b6c5514
Pin actions
gilescope Sep 21, 2025
4b6fd79
fix: yaml lint
janishorsts Sep 21, 2025
3ecde0a
fix: yaml lint
janishorsts Sep 21, 2025
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
19 changes: 11 additions & 8 deletions .github/workflows/.test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:

env:
GO_VERSION: "1.21"
SETUP_BUILDX_VERSION: "latest"
SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream
SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"

jobs:
Expand Down Expand Up @@ -89,13 +89,14 @@ jobs:
});
-
name: Build
uses: docker/bake-action@v4
uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0
with:
provenance: false
targets: integration-tests-base
set: |
*.cache-from=type=gha,scope=${{ inputs.cache_scope }}
*.cache-to=type=gha,scope=${{ inputs.cache_scope }}
# TODO(jhorsts): replace with upstream
# set: |
# *.cache-from=type=gha,scope=${{ inputs.cache_scope }}
# *.cache-to=type=gha,scope=${{ inputs.cache_scope }}

run:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -129,6 +130,7 @@ jobs:
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
-
name: Checkout
uses: actions/checkout@v4
Expand All @@ -147,7 +149,7 @@ jobs:
buildkitd-flags: --debug
-
name: Build test image
uses: docker/bake-action@v4
uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0
with:
provenance: false
targets: integration-tests
Expand All @@ -173,7 +175,8 @@ jobs:
TEST_COVERAGE: 1
TESTPKGS: ${{ matrix.pkg }}
SKIP_INTEGRATION_TESTS: 1
CACHE_FROM: type=gha,scope=${{ inputs.cache_scope }}
# TODO(jhorsts): errors with HTTP 400
# CACHE_FROM: type=gha,scope=${{ inputs.cache_scope }}
-
name: Send to Codecov
if: always()
Expand All @@ -192,7 +195,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: test-reports
name: test-reports-${{ env.TEST_REPORT_NAME }}
path: ./bin/testreports
overwrite: true
-
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/buildkit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:

env:
GO_VERSION: "1.21"
SETUP_BUILDX_VERSION: "latest"
SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream
SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
IMAGE_NAME: "moby/buildkit"
PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le,linux/riscv64"
Expand Down Expand Up @@ -125,13 +125,14 @@ jobs:
env:
RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }}
PLATFORMS: ${{ matrix.platform }}
CACHE_FROM: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }}
CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }}
# TODO(jhorsts): replace with upstream
# CACHE_FROM: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }}
# CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }}
-
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 Down Expand Up @@ -177,8 +178,9 @@ jobs:
env:
RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }}
TARGET: ${{ matrix.target-stage }}
CACHE_FROM: type=gha,scope=image${{ matrix.target-stage }}
CACHE_TO: type=gha,scope=image${{ matrix.target-stage }}
# TODO(jhorsts): replace with upstream
# CACHE_FROM: type=gha,scope=image${{ matrix.target-stage }}
# CACHE_TO: type=gha,scope=image${{ matrix.target-stage }}

release:
runs-on: ubuntu-22.04
Expand All @@ -190,10 +192,11 @@ jobs:
steps:
-
name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
with:
name: buildkit
path: ${{ env.DESTDIR }}
pattern: buildkit-*
merge-multiple: true
-
name: List artifacts
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildx-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
default: 'true'

env:
SETUP_BUILDX_VERSION: "latest"
SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream
REPO_SLUG_TARGET: "moby/buildkit"

jobs:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/dockerd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
default: '23.0.1'

env:
SETUP_BUILDX_VERSION: "latest"
SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream
SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
TESTFLAGS: "-v --parallel=1 --timeout=30m"

Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
buildkitd-flags: --debug
-
name: Download dockerd
uses: actions/download-artifact@v3
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
with:
name: dockerd
path: ./build/
Expand All @@ -127,7 +127,8 @@ jobs:
TESTPKGS: "${{ matrix.pkg }}"
TESTFLAGS: "${{ env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}"
CACHE_FROM: "type=gha,scope=build-integration-tests"
# TODO(jhorsts): replace with upstream
# CACHE_FROM: "type=gha,scope=build-integration-tests"
BUILDKIT_INTEGRATION_DOCKERD_FLAGS: |
--bip=10.66.66.1/24
--default-address-pool=base=10.66.66.0/16,size=24
7 changes: 4 additions & 3 deletions .github/workflows/frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

env:
GO_VERSION: "1.21"
SETUP_BUILDX_VERSION: "latest"
SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream
SETUP_BUILDKIT_TAG: "moby/buildkit:latest"
IMAGE_NAME: "docker/dockerfile-upstream"
PLATFORMS: "linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/mips,linux/mipsle,linux/mips64,linux/mips64le,linux/s390x,linux/ppc64le,linux/riscv64"
Expand Down Expand Up @@ -119,8 +119,9 @@ jobs:
./frontend/dockerfile/cmd/dockerfile-frontend/hack/release "${{ needs.prepare.outputs.typ }}" "${{ matrix.tag }}" "$IMAGE_NAME" "${{ needs.prepare.outputs.push }}"
env:
RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }}
CACHE_FROM: type=gha,scope=${{ env.CACHE_SCOPE }}
CACHE_TO: type=gha,scope=${{ env.CACHE_SCOPE }}
# TODO(jhorsts): replace with upstream
# CACHE_FROM: type=gha,scope=${{ env.CACHE_SCOPE }}
# CACHE_TO: type=gha,scope=${{ env.CACHE_SCOPE }}

release:
runs-on: ubuntu-22.04
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test-os.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v4
uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0
with:
targets: binaries
set: |
Expand All @@ -116,62 +116,63 @@
retention-days: 1

test-freebsd-amd64:
if: false # TODO(jhorsts): Skip freebsd. Fails. Not supported by EarthBuild. Revisit after upstream merge?
runs-on: macos-13
needs:
- build-freebsd-amd64
env:
VAGRANT_VAGRANTFILE: hack/Vagrantfile.freebsd13
GOOS: freebsd
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
with:
name: buildkit-freebsd-amd64
path: ${{ env.DESTDIR }}
-
name: Cache Vagrant boxes
uses: actions/cache@v3
with:
path: ~/.vagrant.d/boxes
key: ${{ runner.os }}-vagrant-${{ hashFiles('hack/Vagrantfile.freebsd13') }}
restore-keys: |
${{ runner.os }}-vagrant-
-
name: Install vagrant and VirtualBox
run: |
set -x
brew tap hashicorp/tap
brew install hashicorp/tap/hashicorp-vagrant
brew install --cask virtualbox
-
name: Check versions
run: |
set -x
vagrant --version
VBoxManage -v
-
name: Set up vagrant
run: |
vagrant up --no-tty
-
name: Smoke test
run: |
vagrant up --provision-with=test-smoke
-
name: BuildKit logs
if: always()
run: |
vagrant ssh -- "sudo cat /vagrant/.tmp/logs/buildkitd"
-
name: Containerd logs
if: always()
run: |
vagrant ssh -- "sudo cat /vagrant/.tmp/logs/containerd"
-
name: Dump context
if: failure()
uses: crazy-max/ghaction-dump-context@v2

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium test

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}
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 @@ -16,7 +16,7 @@ on:
pull_request:

env:
SETUP_BUILDX_VERSION: "latest"
SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream
SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"

jobs:
Expand Down Expand Up @@ -55,6 +55,6 @@ jobs:
buildkitd-flags: --debug
-
name: Validate
uses: docker/bake-action@v4
uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0
with:
targets: ${{ matrix.target }}
5 changes: 3 additions & 2 deletions hack/release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ for pdir in "${output}"/*/; do
cd "$pdir"
releasetar=$(find . -name '*.tar.gz')
filename=$(basename "${releasetar%.tar.gz}")
mv "provenance.json" "${filename}.provenance.json"
mv "sbom-binaries.spdx.json" "${filename}.sbom.json"
# TODO(jhorsts): replace with upstream
# mv "provenance.json" "${filename}.provenance.json"
# mv "sbom-binaries.spdx.json" "${filename}.sbom.json"
find . -name 'sbom*.json' -exec rm {} \;
)
done
Expand Down
Loading