From 7274add7b5e563268e99578bb5fe8febd75a9385 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Sun, 22 Jun 2025 14:33:14 -0400 Subject: [PATCH] Switch to Forge registry. --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/delete-pr-image.yml | 6 +++--- .github/workflows/lint.yml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4281d80..d45dc57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,17 +29,17 @@ jobs: - id: get_versions run: cat workflow-support/versions.json >> $GITHUB_OUTPUT - id: details - uses: kpfleming/composite-actions/image-details@v2 + uses: kpfleming/composite-actions/image-details@v3 with: base_image: python:v4-bookworm-main - id: preflight - uses: kpfleming/composite-actions/ci-preflight@v2 + uses: kpfleming/composite-actions/ci-preflight@v3 with: ci_paths: workflow-support/ci_paths.yml files_hash: ${{ hashfiles('pyproject.toml', 'workflow-support/make_ci_image.sh', '.github/workflows/ci.yml') }} base_image_hash: ${{ steps.details.outputs.base_image_hash }} - id: make-ci-image - uses: kpfleming/composite-actions/make-ci-image@v2 + uses: kpfleming/composite-actions/make-ci-image@v3 if: steps.preflight.outputs.need_image == 'true' with: build_args: jinjanator-plugin-format-toml @@ -47,8 +47,8 @@ jobs: image_name: ${{ steps.details.outputs.image_base }}:${{ steps.preflight.outputs.image_tag }} image_cache_key: ${{ steps.preflight.outputs.image_cache_key }} image_registry: ${{ steps.details.outputs.image_registry }} - registry_username: ${{ secrets.QUAY_BOT_NAME }} - registry_password: ${{ secrets.QUAY_BOT_PASSWORD }} + registry_username: ${{ secrets.FORGE_BOT_NAME }} + registry_password: ${{ secrets.FORGE_API_TOKEN }} ci: needs: - preflight diff --git a/.github/workflows/delete-pr-image.yml b/.github/workflows/delete-pr-image.yml index 94e9514..0ec84e3 100644 --- a/.github/workflows/delete-pr-image.yml +++ b/.github/workflows/delete-pr-image.yml @@ -12,12 +12,12 @@ jobs: runs-on: ubuntu-22.04 steps: - id: details - uses: kpfleming/composite-actions/image-details@v2 + uses: kpfleming/composite-actions/image-details@v3 with: base_image: python:bookworm-main - - uses: kpfleming/composite-actions/delete-pr-image@v2 + - uses: kpfleming/composite-actions/delete-pr-image@v3 with: image_registry: ${{ steps.details.outputs.image_registry }} registry_account: ${{ steps.details.outputs.registry_account }} - registry_token: ${{ secrets.QUAY_API_TOKEN }} + registry_token: ${{ secrets.FORGE_API_TOKEN }} repo_name: ${{ steps.details.outputs.repo_name }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 277cd4a..27aa6f8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,11 +18,11 @@ jobs: with: show-progress: false - id: details - uses: kpfleming/composite-actions/image-details@v2 + uses: kpfleming/composite-actions/image-details@v3 with: base_image: python:bookworm-main - id: preflight - uses: kpfleming/composite-actions/lint-preflight@v2 + uses: kpfleming/composite-actions/lint-preflight@v3 with: lint_paths: workflow-support/lint_paths.yml lint: @@ -36,4 +36,4 @@ jobs: - uses: actions/checkout@v4 with: show-progress: false - - uses: kpfleming/composite-actions/lint-hatch@v2 + - uses: kpfleming/composite-actions/lint-hatch@v3