From 292833cdaced688108bf35898c654b9391ecaf42 Mon Sep 17 00:00:00 2001 From: hisco <39222286+hisco@users.noreply.github.com> Date: Wed, 1 Jul 2026 16:45:09 +0300 Subject: [PATCH 1/2] feat!: upgrade Docker actions and drop buildx_install input Bump docker/build-push-action v6->v7, docker/metadata-action v5->v6, docker/setup-qemu-action v3->v4, and docker/setup-buildx-action v3->v4 in action.yml. In the release workflow, bump actions/checkout v4->v7 and replace disabled codfish with SHA-pinned cycjimmy/semantic-release-action@v6.0.0. BREAKING CHANGE: removed the buildx_install input. docker/setup-buildx-action v4 removed its install input, so the composite no longer exposes buildx_install; the docker build -> docker buildx build alias it enabled is gone. Use the BUILDX_BUILDER env var if that behavior is needed. Claude-Session: https://claude.ai/code/session_011T9ASy4VmRoYrnuTsLd9oU --- .github/workflows/release.yml | 7 ++++--- .github/workflows/test.yml | 23 +++++++++++------------ README.md | 3 --- action.yml | 18 +++++++----------- 4 files changed, 22 insertions(+), 29 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2062b49..a09bc51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,10 +13,11 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - - uses: codfish/semantic-release-action@v4 + - uses: cycjimmy/semantic-release-action@b12c8f6015dc215fe37bc154d4ad456dd3833c90 # v6.0.0 with: - additional-packages: "['semantic-release-github-actions-tags']" + extra_plugins: | + semantic-release-github-actions-tags env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e80f11..ff97761 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: name: Test basic Docker build steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test build with automatic tags uses: ./ @@ -36,7 +36,7 @@ jobs: name: Test with manual tags steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test build with manual tags uses: ./ @@ -61,7 +61,7 @@ jobs: name: Test custom buildx configuration steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test with custom buildx settings uses: ./ @@ -74,7 +74,6 @@ jobs: buildx_driver_opts: | network=bridge buildx_buildkitd_flags: --debug - buildx_install: true push: false load: true @@ -94,7 +93,7 @@ jobs: name: Test multi-platform build steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test multi-platform build (push disabled) uses: ./ @@ -114,7 +113,7 @@ jobs: name: Test with build arguments steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test build with args uses: ./ @@ -138,7 +137,7 @@ jobs: name: Test context from skyhook config steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test build with service_name (api - contextPath only) uses: ./ @@ -160,7 +159,7 @@ jobs: name: Test context + dockerfile from skyhook config steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test build with service_name (worker - contextPath + dockerfilePath) uses: ./ @@ -181,7 +180,7 @@ jobs: name: Test path fallback when no buildTool.docker steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test build with service_name (simple - no buildTool, uses path) uses: ./ @@ -202,7 +201,7 @@ jobs: name: Test config values override inputs steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test that config overrides explicit context/dockerfile inputs uses: ./ @@ -227,7 +226,7 @@ jobs: name: Test fallback when service not found steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test build with non-existent service_name (should fall back to inputs) uses: ./ @@ -250,7 +249,7 @@ jobs: name: Test backward compatibility (no service_name) steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Test build without service_name (should use inputs as before) uses: ./ diff --git a/README.md b/README.md index 13d4a63..9e4be66 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,6 @@ All parameters prefixed with `buildx_` are passed directly to docker/setup-build | `buildx_buildkitd_flags` | BuildKit daemon flags | No | - | | `buildx_buildkitd_config` | BuildKit daemon config file | No | - | | `buildx_buildkitd_config_inline` | BuildKit daemon config inline | No | - | -| `buildx_install` | Set up docker build as alias to docker buildx | No | - | | `buildx_use` | Switch to this builder instance | No | - | | `buildx_endpoint` | Address for docker socket or context | No | - | | `buildx_platforms` | Fixed platforms for current node | No | - | @@ -313,7 +312,6 @@ steps: buildx_driver_opts: | network=host image=moby/buildkit:v0.12.0 - buildx_install: true buildx_platforms: linux/amd64,linux/arm64 # Use remote BuildKit instance @@ -343,7 +341,6 @@ steps: base_tag: v1.2.3 buildx_version: v0.11.2 buildx_buildkitd_flags: --debug --allow-insecure-entitlement network.host - buildx_install: true ``` ## Migration from docker/build-push-action diff --git a/action.yml b/action.yml index 2741e4b..fb6f5c2 100644 --- a/action.yml +++ b/action.yml @@ -120,9 +120,6 @@ inputs: buildx_buildkitd_config_inline: description: 'BuildKit daemon config inline' required: false - buildx_install: - description: 'Set up docker build command as an alias to docker buildx' - required: false buildx_use: description: 'Switch to this builder instance' required: false @@ -164,17 +161,17 @@ runs: steps: - name: Set up QEMU if: ${{ contains(inputs.platforms, ',') || (inputs.platforms != '' && inputs.platforms != 'linux/amd64') }} - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 # Use default buildx when no custom parameters provided - name: Set up Docker Buildx - if: ${{ !inputs.buildx_version && !inputs.buildx_name && !inputs.buildx_driver && !inputs.buildx_driver_opts && !inputs.buildx_buildkitd_flags && !inputs.buildx_buildkitd_config && !inputs.buildx_buildkitd_config_inline && !inputs.buildx_install && !inputs.buildx_use && !inputs.buildx_endpoint && !inputs.buildx_platforms && !inputs.buildx_append && !inputs.buildx_keep_state && !inputs.buildx_cache_binary && !inputs.buildx_cleanup }} - uses: docker/setup-buildx-action@v3 + if: ${{ !inputs.buildx_version && !inputs.buildx_name && !inputs.buildx_driver && !inputs.buildx_driver_opts && !inputs.buildx_buildkitd_flags && !inputs.buildx_buildkitd_config && !inputs.buildx_buildkitd_config_inline && !inputs.buildx_use && !inputs.buildx_endpoint && !inputs.buildx_platforms && !inputs.buildx_append && !inputs.buildx_keep_state && !inputs.buildx_cache_binary && !inputs.buildx_cleanup }} + uses: docker/setup-buildx-action@v4 # Use custom buildx configuration when any parameter is provided - name: Set up Docker Buildx (custom) - if: ${{ inputs.buildx_version || inputs.buildx_name || inputs.buildx_driver || inputs.buildx_driver_opts || inputs.buildx_buildkitd_flags || inputs.buildx_buildkitd_config || inputs.buildx_buildkitd_config_inline || inputs.buildx_install || inputs.buildx_use || inputs.buildx_endpoint || inputs.buildx_platforms || inputs.buildx_append || inputs.buildx_keep_state || inputs.buildx_cache_binary || inputs.buildx_cleanup }} - uses: docker/setup-buildx-action@v3 + if: ${{ inputs.buildx_version || inputs.buildx_name || inputs.buildx_driver || inputs.buildx_driver_opts || inputs.buildx_buildkitd_flags || inputs.buildx_buildkitd_config || inputs.buildx_buildkitd_config_inline || inputs.buildx_use || inputs.buildx_endpoint || inputs.buildx_platforms || inputs.buildx_append || inputs.buildx_keep_state || inputs.buildx_cache_binary || inputs.buildx_cleanup }} + uses: docker/setup-buildx-action@v4 with: version: ${{ inputs.buildx_version }} name: ${{ inputs.buildx_name }} @@ -183,7 +180,6 @@ runs: buildkitd-flags: ${{ inputs.buildx_buildkitd_flags }} buildkitd-config: ${{ inputs.buildx_buildkitd_config }} buildkitd-config-inline: ${{ inputs.buildx_buildkitd_config_inline }} - install: ${{ inputs.buildx_install || 'false' }} use: ${{ inputs.buildx_use || 'true' }} endpoint: ${{ inputs.buildx_endpoint }} platforms: ${{ inputs.buildx_platforms }} @@ -299,7 +295,7 @@ runs: # Generate labels always, and tags only in ergonomic mode (image+base_tag) - name: Docker meta id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ${{ inputs.image }} tags: | @@ -343,7 +339,7 @@ runs: - name: Build and push Docker image id: build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: ${{ inputs.context || steps.skyhook_config.outputs.resolved_context || '.' }} file: ${{ inputs.dockerfile || steps.skyhook_config.outputs.resolved_dockerfile || 'Dockerfile' }} From 93618789ff7276872fa768a3a558bfe5f09acb15 Mon Sep 17 00:00:00 2001 From: hisco <39222286+hisco@users.noreply.github.com> Date: Wed, 1 Jul 2026 17:53:56 +0300 Subject: [PATCH 2/2] ci: add Dependabot for GitHub Actions --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..f6faee6 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + groups: + github-actions: + patterns: + - "*"