From 41fbedfdecb2bcbb5482785e4726d52ebf4649d1 Mon Sep 17 00:00:00 2001 From: Dmytro Smirnov Date: Wed, 24 Jun 2026 16:38:02 +0300 Subject: [PATCH 1/4] ci: improve docker dependency PR workflow --- .github/workflows/docker-dependency-updater.yml | 6 ++++++ .github/workflows/docker-ops.yml | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/.github/workflows/docker-dependency-updater.yml b/.github/workflows/docker-dependency-updater.yml index c7a9172a..9bd94e80 100644 --- a/.github/workflows/docker-dependency-updater.yml +++ b/.github/workflows/docker-dependency-updater.yml @@ -20,6 +20,10 @@ env: REPORT_PATH: docker-dependency-report.json UPDATE_BRANCH: docker-dependency-updates PR_TITLE: "chore(deps): docker dependency upgrade" + PR_TEAM_REVIEWER: worker + PR_LABELS: |- + docker + dependencies PR_AUTO_MERGE: "true" PR_MERGE_METHOD: squash COMMIT_MESSAGE: "chore(deps): update Docker dependency pins" @@ -382,6 +386,8 @@ jobs: body-path: docker-dependency-pr-body.md branch: ${{ needs.config.outputs.update_branch }} add-paths: ${{ needs.config.outputs.dockerfile }} + labels: ${{ env.PR_LABELS }} + team-reviewers: ${{ env.PR_TEAM_REVIEWER }} draft: false delete-branch: true diff --git a/.github/workflows/docker-ops.yml b/.github/workflows/docker-ops.yml index c6a800ec..8e658fbf 100644 --- a/.github/workflows/docker-ops.yml +++ b/.github/workflows/docker-ops.yml @@ -2,6 +2,21 @@ name: Build/Release "on": + pull_request: + branches: + - latest + paths: + - ".github/workflows/docker-ops.yml" + - ".dockerignore" + - "Dockerfile" + - "bin/**" + - "lib/**" + - "src/**" + - "etc/**" + - "test/**" + - "Makefile" + - "Makefile.variables" + - "ci/**" push: branches: - "**" From 9effe19c68bf7fcfab54333b6479ee247e5da952 Mon Sep 17 00:00:00 2001 From: Dmytro Smirnov Date: Wed, 24 Jun 2026 16:40:42 +0300 Subject: [PATCH 2/4] ci: validate docker pull requests without release workflow --- .github/workflows/docker-ops.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/docker-ops.yml b/.github/workflows/docker-ops.yml index 8e658fbf..b8ba56fb 100644 --- a/.github/workflows/docker-ops.yml +++ b/.github/workflows/docker-ops.yml @@ -37,6 +37,7 @@ name: Build/Release jobs: docker-ops: name: Docker Ops + if: github.event_name != 'pull_request' permissions: contents: write security-events: write @@ -52,9 +53,40 @@ jobs: secrets: docker_token: ${{ secrets.DOCKER_TOKEN }} + docker-ops-pr: + name: Docker Ops PR Build + if: github.event_name == 'pull_request' + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Checkout code + uses: actions/checkout@v6 + + - name: Build worker image + run: make build IMAGE_NAME=worker-pr-validation TAG="${GITHUB_SHA}" + + - name: Capture runtime output + run: | + mkdir -p runtime-output + docker run --rm \ + -e WORKER_RUNTIME_OUTPUT=true \ + "worker-pr-validation:${GITHUB_SHA}" \ + true \ + > runtime-output/runtime.json + jq -e '.env | type == "object"' runtime-output/runtime.json + jq -c . runtime-output/runtime.json + + - name: Upload runtime output artifact + uses: actions/upload-artifact@v7 + with: + name: worker-pr-runtime-output + path: runtime-output/runtime.json + runtime-output: name: Runtime Output needs: docker-ops + if: github.event_name != 'pull_request' runs-on: ubuntu-latest permissions: contents: read From bf603d025175d883e609be4630b8b0c5506fe1b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 11:22:55 +0000 Subject: [PATCH 3/4] Bump actions/checkout from 6 to 7 in /.github/workflows Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/docker-dependency-updater.yml | 4 ++-- .github/workflows/docker-ops.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 901e0acb..04047da9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Install ShellCheck run: sudo apt-get install -y shellcheck @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Install hadolint run: | @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Install yamllint run: | diff --git a/.github/workflows/docker-dependency-updater.yml b/.github/workflows/docker-dependency-updater.yml index 9bd94e80..96017b78 100644 --- a/.github/workflows/docker-dependency-updater.yml +++ b/.github/workflows/docker-dependency-updater.yml @@ -59,7 +59,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Load dependency updater defaults id: config @@ -149,7 +149,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: ${{ github.ref }} diff --git a/.github/workflows/docker-ops.yml b/.github/workflows/docker-ops.yml index b8ba56fb..5f8be09b 100644 --- a/.github/workflows/docker-ops.yml +++ b/.github/workflows/docker-ops.yml @@ -92,7 +92,7 @@ jobs: contents: read steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Build worker image run: make build IMAGE_NAME=worker-runtime-output TAG="${GITHUB_SHA}" From 6754ee34abeb7e67023bef01aec908aa74718cdd Mon Sep 17 00:00:00 2001 From: Dmytro Smirnov Date: Wed, 24 Jun 2026 16:44:31 +0300 Subject: [PATCH 4/4] ci: keep docker ops validation on push --- .../workflows/docker-dependency-updater.yml | 1 + .github/workflows/docker-ops.yml | 47 ------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/.github/workflows/docker-dependency-updater.yml b/.github/workflows/docker-dependency-updater.yml index 96017b78..6eb8255f 100644 --- a/.github/workflows/docker-dependency-updater.yml +++ b/.github/workflows/docker-dependency-updater.yml @@ -145,6 +145,7 @@ jobs: permissions: contents: write + issues: write pull-requests: write steps: diff --git a/.github/workflows/docker-ops.yml b/.github/workflows/docker-ops.yml index 5f8be09b..56ae143e 100644 --- a/.github/workflows/docker-ops.yml +++ b/.github/workflows/docker-ops.yml @@ -2,21 +2,6 @@ name: Build/Release "on": - pull_request: - branches: - - latest - paths: - - ".github/workflows/docker-ops.yml" - - ".dockerignore" - - "Dockerfile" - - "bin/**" - - "lib/**" - - "src/**" - - "etc/**" - - "test/**" - - "Makefile" - - "Makefile.variables" - - "ci/**" push: branches: - "**" @@ -37,7 +22,6 @@ name: Build/Release jobs: docker-ops: name: Docker Ops - if: github.event_name != 'pull_request' permissions: contents: write security-events: write @@ -53,40 +37,9 @@ jobs: secrets: docker_token: ${{ secrets.DOCKER_TOKEN }} - docker-ops-pr: - name: Docker Ops PR Build - if: github.event_name == 'pull_request' - runs-on: ubuntu-latest - permissions: - contents: read - steps: - - name: Checkout code - uses: actions/checkout@v6 - - - name: Build worker image - run: make build IMAGE_NAME=worker-pr-validation TAG="${GITHUB_SHA}" - - - name: Capture runtime output - run: | - mkdir -p runtime-output - docker run --rm \ - -e WORKER_RUNTIME_OUTPUT=true \ - "worker-pr-validation:${GITHUB_SHA}" \ - true \ - > runtime-output/runtime.json - jq -e '.env | type == "object"' runtime-output/runtime.json - jq -c . runtime-output/runtime.json - - - name: Upload runtime output artifact - uses: actions/upload-artifact@v7 - with: - name: worker-pr-runtime-output - path: runtime-output/runtime.json - runtime-output: name: Runtime Output needs: docker-ops - if: github.event_name != 'pull_request' runs-on: ubuntu-latest permissions: contents: read