From c2512cf1f73c9a9d0dec101fe22ccc3c0981d048 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Wed, 30 Oct 2024 20:02:22 +0800 Subject: [PATCH] fix: use reusable workflow instead of composite action Signed-off-by: Yukai Huang --- .github/actions/build-steps/action.yml | 117 +++++++++++++------------ .github/workflows/build-steps.yml | 74 ++++++++++++++++ .github/workflows/push-image.yml | 46 ++++------ 3 files changed, 150 insertions(+), 87 deletions(-) create mode 100644 .github/workflows/build-steps.yml diff --git a/.github/actions/build-steps/action.yml b/.github/actions/build-steps/action.yml index f60b11921..2057d06f5 100644 --- a/.github/actions/build-steps/action.yml +++ b/.github/actions/build-steps/action.yml @@ -15,61 +15,64 @@ on: buildpack: required: true type: string + runs_on: + required: true + type: string -runs: - using: composite - - steps: - - - name: Prepare Platform Environment - run: | - platform=${{ inputs.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - - name: Checkout - uses: actions/checkout@v4 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ inputs.registry_image }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push by digest - id: build - uses: docker/build-push-action@v5 - with: - context: . - file: ./deployments/Dockerfile - platforms: ${{ inputs.platform }} - labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ inputs.registry_image }},push-by-digest=true,name-canonical=true,push=true - build-args: | - RUNTIME=${{ inputs.runtime }} - BUILDPACK=${{ inputs.buildpack }} - - - name: Export digest - run: | - mkdir -p /tmp/digests - digest="${{ steps.build.outputs.digest }}" - touch "/tmp/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-${{ env.PLATFORM_PAIR }} - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 +jobs: + build: + runs-on: ${{ inputs.runs_on }} + steps: + - + name: Prepare Platform Environment + run: | + platform=${{ inputs.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + - + name: Checkout + uses: actions/checkout@v4 + - + name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ inputs.registry_image }} + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push by digest + id: build + uses: docker/build-push-action@v5 + with: + context: . + file: ./deployments/Dockerfile + platforms: ${{ inputs.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ inputs.registry_image }},push-by-digest=true,name-canonical=true,push=true + build-args: | + RUNTIME=${{ inputs.runtime }} + BUILDPACK=${{ inputs.buildpack }} + - + name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + - + name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 diff --git a/.github/workflows/build-steps.yml b/.github/workflows/build-steps.yml new file mode 100644 index 000000000..7d8804abe --- /dev/null +++ b/.github/workflows/build-steps.yml @@ -0,0 +1,74 @@ +name: Build Steps + +on: + workflow_call: + inputs: + platform: + required: true + type: string + registry_image: + required: true + type: string + runtime: + required: true + type: string + buildpack: + required: true + type: string + +jobs: + build: + steps: + - + name: Prepare Platform Environment + run: | + platform=${{ inputs.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + - + name: Checkout + uses: actions/checkout@v4 + - + name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ inputs.registry_image }} + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push by digest + id: build + uses: docker/build-push-action@v5 + with: + context: . + file: ./deployments/Dockerfile + platforms: ${{ inputs.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ inputs.registry_image }},push-by-digest=true,name-canonical=true,push=true + build-args: | + RUNTIME=${{ inputs.runtime }} + BUILDPACK=${{ inputs.buildpack }} + - + name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + - + name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index a241ef6f0..7312dde76 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -19,38 +19,24 @@ env: jobs: build-amd64: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set Platform Variable - run: echo "PLATFORM_PAIR=linux-amd64" >> $GITHUB_ENV - - - name: Execute Build Steps - uses: ./.github/actions/build-steps - with: - platform: linux/amd64 - registry_image: ${{ env.REGISTRY_IMAGE }} - runtime: ${{ github.event.inputs.runtime }} - buildpack: ${{ github.event.inputs.buildpack }} - secrets: inherit + uses: ./.github/workflows/build-steps.yml + secrets: inherit + with: + platform: linux/amd64 + registry_image: ${{ env.REGISTRY_IMAGE }} + runtime: ${{ github.event.inputs.runtime }} + buildpack: ${{ github.event.inputs.buildpack }} + runs_on: ubuntu-latest build-arm64: - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - - - name: Set Platform Variable - run: echo "PLATFORM_PAIR=linux-arm64" >> $GITHUB_ENV - - - name: Execute Build Steps - uses: ./.github/actions/build-steps - with: - platform: linux/arm64 - registry_image: ${{ env.REGISTRY_IMAGE }} - runtime: ${{ github.event.inputs.runtime }} - buildpack: ${{ github.event.inputs.buildpack }} - secrets: inherit + uses: ./.github/workflows/build-steps.yml + secrets: inherit + with: + platform: linux/arm64 + registry_image: ${{ env.REGISTRY_IMAGE }} + runtime: ${{ github.event.inputs.runtime }} + buildpack: ${{ github.event.inputs.buildpack }} + runs_on: macos-latest merge: runs-on: ubuntu-latest