diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ce3aef6..a6b538c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,10 +5,6 @@ on: tags: - "cargo-changeset@v*" workflow_dispatch: - inputs: - tag: - description: "Tag to publish (e.g. cargo-changeset@v0.1.0). Uses latest git tag if empty." - required: false env: GHCR_IMAGE: ghcr.io/lukidoescode/cargo-changeset @@ -38,31 +34,31 @@ jobs: - name: Extract metadata id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: | ${{ env.GHCR_IMAGE }} ${{ env.DOCKERHUB_IMAGE }} - name: Log in to GHCR - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Log in to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Build and push by digest id: build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . platforms: ${{ matrix.platform }} @@ -101,24 +97,24 @@ jobs: merge-multiple: true - name: Log in to GHCR - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Log in to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Extract metadata for GHCR id: meta-ghcr - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ${{ env.GHCR_IMAGE }} tags: | @@ -127,7 +123,7 @@ jobs: - name: Extract metadata for Docker Hub id: meta-dockerhub - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ${{ env.DOCKERHUB_IMAGE }} tags: | diff --git a/.github/workflows/scripts/dispatch-publish.sh b/.github/workflows/scripts/dispatch-publish.sh index a1f633f..87e0622 100644 --- a/.github/workflows/scripts/dispatch-publish.sh +++ b/.github/workflows/scripts/dispatch-publish.sh @@ -49,4 +49,9 @@ while IFS=" " read -r depth crate; do echo "Dispatching publish for $tag (depth=$depth)" gh workflow run publish.yml --repo "$GITHUB_REPOSITORY" --ref "refs/tags/$tag" + if [ "$crate" = "cargo-changeset" ]; then + echo "Dispatching docker for $tag (depth=$depth)" + gh workflow run docker.yml --repo "$GITHUB_REPOSITORY" --ref "refs/tags/$tag" + fi + done <<< "$depth_order"