From 63cf6cb7032c225e7623b72e0ca728b3bd44980f Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Mon, 20 Jan 2025 22:35:58 +0900 Subject: [PATCH] .github: Revert release.yml (#41) * Revert ".github: Fix manifest step" This reverts commit fb11d88de73cf7dbcf2eba8783827f38ee3155be. * Revert ".github: Fix manifest issue" This reverts commit 21e44f99e9dbd993a1ba9cd56fdbc7b7fb33318a. * .github: Revert release.yml --- .github/workflows/release.yml | 76 ++++------------------------------- 1 file changed, 7 insertions(+), 69 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c7f31ef..4a36093 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,50 +15,22 @@ on: run-name: "Release: ${{ inputs.package }}" jobs: - generate-version: + release-to-ghcr: concurrency: group: release-to-ghcr-${{ inputs.package }} cancel-in-progress: false if: contains('["brettcannon", "corona10", "erlend-aasland"]', github.actor) runs-on: ubuntu-latest - outputs: - builddate: ${{ steps.version.outputs.builddate }} steps: # Checkout push-to-registry action github repository - name: Set Calver Date run: | echo "builddate=$(date +'%Y.%m.%d')" >> $GITHUB_OUTPUT id: version - - build_amd64: - needs: generate-version - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login To GHCR - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v6 - with: - context: ./${{ inputs.package }} - platforms: linux/amd64 - push: true - tags: | - ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 - - build_arm64: - needs: generate-version - runs-on: ubuntu-24.04-arm - steps: - - name: Checkout + - name: Checkout Push to Registry action uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Login To GHCR @@ -71,42 +43,8 @@ jobs: uses: docker/build-push-action@v6 with: context: ./${{ inputs.package }} - platforms: linux/arm64 + platforms: linux/amd64,linux/arm64 push: true tags: | - ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64 - - set_manifest: - needs: [generate-version, build_amd64, build_arm64] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login To GHCR - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Pull images - run: | - docker pull ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 - docker tag ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-amd64 ghcr.io/python/${{ inputs.package }}:amd64 - - docker pull ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64 - docker tag ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }}-arm64 ghcr.io/python/${{ inputs.package }}:arm64 - - - name: Set manifest - run: | - docker manifest create ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }} \ - ghcr.io/python/${{ inputs.package }}:amd64 \ - ghcr.io/python/${{ inputs.package }}:arm64 - - docker manifest create ghcr.io/python/${{ inputs.package }}:latest \ - ghcr.io/python/${{ inputs.package }}:amd64 \ - ghcr.io/python/${{ inputs.package }}:arm64 - - docker manifest push ghcr.io/python/${{ inputs.package }}:latest - docker manifest push ghcr.io/python/${{ inputs.package }}:${{ needs.generate-version.outputs.builddate }}.${{ github.run_id }} + ghcr.io/python/${{ inputs.package }}:${{ steps.version.outputs.builddate }}.${{ github.run_id }} + ghcr.io/python/${{ inputs.package }}:latest