update ci

qiqizjl · Oct 4, 2022 · 83190c3 · 83190c3
1 parent ce61832
commit 83190c3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 29 deletions.
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -64,15 +64,12 @@ jobs:
           cd bin
           strip swoole-cli
           tar -cJvf swoole-cli.tar.xz swoole-cli LICENSE
-          mv swoole-cli.tar.xz ../swoole-cli.tar.xz
+          mv swoole-cli.tar.xz ../swoole-cli-linux.x64-${{ github.ref_name }}.tar.xz
       - if: startsWith(github.event.ref, 'refs/tags')
         name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
+        uses: softprops/action-gh-release@v1
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: swoole-cli.tar.xz
-          asset_name: swoole-cli-linux-x64-${{ github.ref_name }}.tar.xz
-          tag: ${{ github.ref }}
-          overwrite: true
+          files: |
+            swoole-cli-linux.x64-${{ github.ref_name }}.tar.xz
 
 
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches: [ "7.4.x-4.8.x" ]
     tags:
-      - 7.4.*-4.8.*-r*-beta
+      - beta-7.4.*-4.8.*-r*
 
 jobs:
   build:
@@ -59,24 +59,21 @@ jobs:
           path: |
             bin
           retention-days: 5
-#      - if: startsWith(github.event.ref, 'refs/tags')
+    #- if: startsWith(github.event.ref, 'refs/tags')
       - name: compress binrary
         run: |
           cd bin
           tar -cJvf swoole-cli-${{ github.sha }}.tar.xz swoole-cli LICENSE
-          mv swoole-cli-${{ github.sha }}.tar.xz ../swoole-cli-${{ github.sha }}.tar.xz
+          mv swoole-cli-${{ github.sha }}.tar.xz ../swoole-cli-macos.x64-${{ github.ref_name }}.tar.xz
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew reinstall curl
-      - name: Test background
-        uses: luchihoratiu/debug-via-ssh@main
-        with:
-          NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
-          SSH_PASS: ${{ secrets.SSH_PASS }}
+#      - name: Test background
+#        uses: luchihoratiu/debug-via-ssh@main
+#        with:
+#          NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
+#          SSH_PASS: ${{ secrets.SSH_PASS }}
       - if: startsWith(github.event.ref, 'refs/tags')
         name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
+        uses: softprops/action-gh-release@v1
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: swoole-cli-${{ github.sha }}.tar.xz
-          asset_name: swoole-cli-macos.x64-${{ github.ref_name }}.tar.xz
-          tag: ${{ github.ref }}
-          overwrite: true
+          files: |
+            swoole-cli-macos.x64-${{ github.ref_name }}.tar.xz
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -65,7 +65,7 @@ jobs:
           ./bin/swoole-cli.exe sapi/cygwin-pack.php && \
           chmod +x  dist/bin/* && \
           cd dist && \
-          zip -r ../swoole-cli.zip *
+          zip -r ../swoole-cli-cygwin.x64-${{ github.ref_name }}.zip *
         shell: C:\cygwin\bin\bash.exe --login -eo pipefail -o igncr {0}
       - if: failure()
         name: Test background
@@ -78,14 +78,10 @@ jobs:
           name: swoole-cli-cygwin-${{ github.sha }}
           path: |
             dist
-            swoole-cli.zip
           retention-days: 5
       - if: startsWith(github.event.ref, 'refs/tags')
         name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
+        uses: softprops/action-gh-release@v1
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: swoole-cli.zip
-          asset_name: swoole-cli-cygwin.x64-${{ github.ref_name }}.zip
-          tag: ${{ github.ref }}
-          overwrite: true
+          files: |
+            swoole-cli-cygwin.x64-${{ github.ref_name }}.zip