fix CI

BrightXiaoHan · Aug 13, 2023 · 88204a3 · 88204a3
1 parent dde8120
commit 88204a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
       - v*
   pull_request:
     branches:
-      - release*
+      - main
 
 jobs:
   build-x86_64:
@@ -26,12 +26,12 @@ jobs:
 
       - name: Pack
         shell: bash
-        run: scripts/pack.sh
+        run: scripts/pack.sh home-cli-x86_64.tar
 
       - uses: actions/upload-artifact@v3
         with:
           name: home-cli-pack-x86_64
-          path: home-cli.tar
+          path: home-cli-x86_64.tar
 
   run-x86_64:
     runs-on: ubuntu-20.04
@@ -66,12 +66,12 @@ jobs:
 
       - name: Pack
         shell: bash
-        run: scripts/pack.sh
+        run: scripts/pack.sh home-cli-arm64.tar
 
       - uses: actions/upload-artifact@v3
         with:
           name: home-cli-pack-arm64
-          path: home-cli.tar
+          path: home-cli-arm64.tar
 
   run-arm64:
     runs-on: ubuntu-20.04
@@ -113,7 +113,6 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: home-cli-pack-x86_64
-          path: ./home-cli-x86_64.tar
 
       - name: Upload Assets x86_64
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
@@ -129,7 +128,6 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: home-cli-pack-arm64
-          path: ./home-cli-arm64.tar
 
       - name: Upload Assets arm64
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')

diff --git a/scripts/pack.sh b/scripts/pack.sh
@@ -1,3 +1,4 @@
+OUTPUT={$1:-homecli.tar.gz}
 DIR=~/.cache/homecli
 
 source $DIR/miniconda/bin/activate
@@ -7,11 +8,11 @@ CURDIR=$(pwd)
 echo $CURDIR
 
 cd $DIR
-tar -cvf $CURDIR/home-cli.tar \
+tar -cvf $CURDIR/$OUTPUT \
     HOME bin miniconda.tar.gz nodejs > /dev/null
 rm miniconda.tar.gz
 cd -
 
 cd ~/.local/share/
-tar -rvf $CURDIR/home-cli.tar nvim/ > /dev/null
+tar -rvf $CURDIR/$OUTPUT nvim/ > /dev/null
 cd -