fix: fix release flow

junkurihara · Oct 12, 2023 · a5a6840 · a5a6840
1 parent 9340679
commit a5a6840
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 28 deletions.
diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml
@@ -4,8 +4,8 @@ on:
     branches:
       - "develop"
       - "main"
-    tags:
-      - "*.*.*"
+  pull_request:
+    types: [synchronize, opened]
 
 env:
   GHCR: ghcr.io
@@ -119,19 +119,19 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # - name: Nightly build test on amd64 for pull requests
-      #   if: ${{ github.event_name == 'pull_request' }}
-      #   uses: docker/build-push-action@v5
-      #   with:
-      #     context: .
-      #     build-args: ${{ matrix.build-args }}
-      #     push: false
-      #     build-contexts: ${{ matrix.build-contexts }}
-      #     file: ${{ matrix.dockerfile }}
-      #     cache-from: type=gha,scope=rpxy-nightly-${{ matrix.target }}
-      #     cache-to: type=gha,mode=max,scope=rpxy-nightly-${{ matrix.target }}
-      #     platforms: linux/amd64
-      #     labels: ${{ steps.meta.outputs.labels }}
+      - name: Nightly build test on amd64 for pull requests
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          build-args: ${{ matrix.build-args }}
+          push: false
+          build-contexts: ${{ matrix.build-contexts }}
+          file: ${{ matrix.dockerfile }}
+          cache-from: type=gha,scope=rpxy-nightly-${{ matrix.target }}
+          cache-to: type=gha,mode=max,scope=rpxy-nightly-${{ matrix.target }}
+          platforms: linux/amd64
+          labels: ${{ steps.meta.outputs.labels }}
 
       - name: Nightly build and push from develop branch
         if: ${{ (github.ref_name == 'develop') && (github.event_name == 'push') }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,6 +5,10 @@ on:
       - "Build and publish docker"
     types:
       - "completed"
+  pull_request:
+    types: [closed]
+    branches:
+      - main
 
 jobs:
   on-success:
@@ -70,26 +74,27 @@ jobs:
 
     steps:
       - run: "echo 'The relese triggering workflows passed'"
+
       - name: "set env"
+        id: "set-env"
         run: |
-          if [ ${{ matrix.platform }} = "linux/amd64" ];then PLATFORM_MAP="x86_64";else PLATFORM_MAP="aarch64";fi
-          if [ ${{ github.ref_name == 'develop' }} ];then BUILD_NAME="rpxy-nightly";else BUILD_NAME="rpxy";fi
-          echo "PLATFORM_MAP=${PLATFORM_MAP}" >> $GITHUB_ENV
-          echo "TARGET_NAME=${BUILD_NAME}-${PLATFORM_MAP}-unknown-linux-${{ matrix.target }}${{ matrix.build-feature }}" >> $GITHUB_ENV
+          if [ ${{ matrix.platform }} = "linux/amd64" ]; then PLATFORM_MAP="x86_64"; else PLATFORM_MAP="aarch64"; fi
+          if [ ${{ github.ref_name == 'develop' }} ]; then BUILD_NAME="-nightly"; else BUILD_NAME=""; fi
+          if [ ${{ github.ref_name == 'develop' }} ]; then BUILD_IMG="nightly"; else BUILD_IMG="latest"; fi
+          echo "build_img=${BUILD_IMG}" >> $GITHUB_OUTPUT
+          echo "target_name=rpxy${BUILD_NAME}-${PLATFORM_MAP}-unknown-linux-${{ matrix.target }}${{ matrix.build-feature }}" >> $GITHUB_OUTPUT
 
       - name: "docker pull and extract binary from docker image"
         id: "extract-binary"
         run: |
-          CONTAINER_ID=`docker create --platform=${{ matrix.platform }} ghcr.io/junkurihara/rust-rpxy:nightly${{ matrix.tags-suffix }}`
-          docker cp ${CONTAINER_ID}:/rpxy/bin/rpxy /tmp/${TARGET_NAME}
-          cd /tmp
-          echo "artifact=${TARGET_NAME}" >> $GITHUB_OUTPUT
+          CONTAINER_ID=`docker create --platform=${{ matrix.platform }} ghcr.io/junkurihara/rust-rpxy:${{ steps.set-env.outputs.build_img }}${{ matrix.tags-suffix }}`
+          docker cp ${CONTAINER_ID}:/rpxy/bin/rpxy /tmp/${{ steps.set-env.outputs.target_name }}
 
       - name: "upload artifacts"
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ steps.extract-binary.outputs.artifact }}
-          path: "/tmp/${{ steps.extract-binary.outputs.artifact }}"
+          name: ${{ steps.set-env.outputs.target_name }}
+          path: "/tmp/${{ steps.set-env.outputs.target_name }}"
 
   on-failure:
     runs-on: ubuntu-latest
@@ -99,7 +104,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
+    if: ${{ github.event_name == 'pull_request' }}
     needs: on-success
     steps:
       - name: checkout
@@ -119,10 +124,11 @@ jobs:
 
       - name: release
         uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
         with:
           files: /tmp/assets/*.tar.gz
-          tag_name: ${{ github.ref }}
+          name: ${{ github.event.pull_request.title }}
+          tag_name: ${{ github.event.pull_request.title }}
+          body: ${{ github.event.pull_request.body }}
           draft: true
           prerelease: false
           generate_release_notes: true