fix(ci): Update tag name and unified steps

janhq · Oct 5, 2023 · 38647e3 · 38647e3
1 parent d0957da
commit 38647e3
Showing 1 changed file with 59 additions and 93 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,39 +46,30 @@ jobs:
           CC=gcc-8 make -j $(nproc)
           ls -la
 
-      - name: Determine tag name
-        id: tag
+      - name: Extract branch name
         shell: bash
-        run: |
-          BUILD_NUMBER="$(git rev-list --count HEAD)"
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-            echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
-          else
-            SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-            echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-          fi
+        id: extract_branch
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+      - name: Extract commit short SHA
+        id: extract_commit_id
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
       - name: Package
         shell: bash
         run: |
-          mkdir -p build/nitro-${{ steps.tag.outputs.name }}-linux-amd64
-          mkdir -p build/nitro-${{ steps.tag.outputs.name }}-linux-amd64/config
-          cp config.json build/nitro-${{ steps.tag.outputs.name }}-linux-amd64/config
-          cp build/nitro build/nitro-${{ steps.tag.outputs.name }}-linux-amd64
-          cd build
-          zip -r nitro-${{ steps.tag.outputs.name }}-linux-amd64.zip nitro-${{ steps.tag.outputs.name }}-linux-amd64
-          ls -la
-          cd ..
+          mkdir -p nitro && mkdir -p nitro/config
+          cp config.json nitro/config/
+          cp build/nitro nitro/
+          zip -r nitro.zip nitro
 
       - name: Upload binaries to release
-        if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
+        # if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: build/nitro-${{ steps.tag.outputs.name }}-linux-amd64.zip
-          asset_name: nitro-${{ steps.tag.outputs.name }}-linux-amd64.zip
-          tag: ${{ steps.tag.outputs.name }}
+          file: nitro.zip
+          asset_name: nitro-${{ steps.extract_commit_id.outputs.sha_short }}-linux-amd64.zip
+          tag: ${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_commit_id.outputs.sha_short }}
 
   ubuntu-amd64-cuda-build:
     runs-on: linux-gpu
@@ -106,39 +97,31 @@ jobs:
           CC=gcc-8 make -j $(nproc)
           ls -la   
 
-      - name: Determine tag name
-        id: tag
+      - name: Extract branch name
         shell: bash
-        run: |
-          BUILD_NUMBER="$(git rev-list --count HEAD)"
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-            echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
-          else
-            SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-            echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-          fi
+        id: extract_branch
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"   
+
+      - name: Extract commit short SHA
+        id: extract_commit_id
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
       - name: Package
         shell: bash
         run: |
-          mkdir -p build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda
-          mkdir -p build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda/config
-          cp config.json build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda/config
-          cp build/nitro build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda
-          cd build
-          zip -r nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda.zip nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda
-          ls -la
-          cd ..
+          mkdir -p nitro && mkdir -p nitro/config
+          cp config.json nitro/config/
+          cp build/nitro nitro/
+          zip -r nitro.zip nitro
 
       - name: Upload binaries to release
         # if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda.zip
-          asset_name: nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda.zip
-          tag: ${{ steps.tag.outputs.name }}
+          file: nitro.zip
+          asset_name: nitro-${{ steps.extract_commit_id.outputs.sha_short }}-linux-amd64-cuda.zip
+          tag: ${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_commit_id.outputs.sha_short }}
 
   macOS-M-build:
     runs-on: mac-silicon
@@ -167,40 +150,32 @@ jobs:
           CC=gcc-8 make -j $(nproc)
           ls -la
 
-      - name: Determine tag name
-        id: tag
+      - name: Extract branch name
         shell: bash
-        run: |
-          BUILD_NUMBER="$(git rev-list --count HEAD)"
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-            echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
-          else
-            SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-            echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-          fi
-
+        id: extract_branch
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"   
+
+      - name: Extract commit short SHA
+        id: extract_commit_id
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
       - name: Package
         shell: bash
         run: |
-          mkdir -p build/nitro-${{ steps.tag.outputs.name }}-mac-arm64
-          mkdir -p build/nitro-${{ steps.tag.outputs.name }}-mac-arm64/config
-          cp config.json build/nitro-${{ steps.tag.outputs.name }}-mac-arm64/config
-          cp llama.cpp/ggml-metal.h build/nitro-${{ steps.tag.outputs.name }}-mac-arm64
-          cp build/nitro build/nitro-${{ steps.tag.outputs.name }}-mac-arm64
-          cd build
-          zip -r nitro-${{ steps.tag.outputs.name }}-mac-arm64.zip nitro-${{ steps.tag.outputs.name }}-mac-arm64
-          ls -la
-          cd ..
+          mkdir -p nitro && mkdir -p nitro/config
+          cp config.json nitro/config/
+          cp llama.cpp/ggml-metal.h nitro/
+          cp build/nitro nitro/
+          zip -r nitro.zip nitro
 
       - name: Upload binaries to release
         # if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: build/nitro-${{ steps.tag.outputs.name }}-mac-arm64.zip
-          asset_name: nitro-${{ steps.tag.outputs.name }}-mac-arm64.zip
-          tag: ${{ steps.tag.outputs.name }}
+          file: nitro.zip
+          asset_name: nitro-${{ steps.extract_commit_id.outputs.sha_short }}-mac-arm64.zip
+          tag: ${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_commit_id.outputs.sha_short }}
 
   macOS-Intel-build:
     runs-on: macos-latest
@@ -228,37 +203,28 @@ jobs:
           CC=gcc-8 make -j $(nproc)
           ls -la
 
-      - name: Determine tag name
-        id: tag
+      - name: Extract branch name
         shell: bash
-        run: |
-          BUILD_NUMBER="$(git rev-list --count HEAD)"
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-            echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
-          else
-            SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
-            echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
-          fi
-
+        id: extract_branch
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"   
+
+      - name: Extract commit short SHA
+        id: extract_commit_id
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
       - name: Package
         shell: bash
         run: |
-          mkdir -p build/nitro-${{ steps.tag.outputs.name }}-mac-amd64
-          mkdir -p build/nitro-${{ steps.tag.outputs.name }}-mac-amd64/config
-          cp config.json build/nitro-${{ steps.tag.outputs.name }}-mac-amd64/config
-          cp llama.cpp/ggml-metal.h build/nitro-${{ steps.tag.outputs.name }}-mac-amd64
-          cp build/nitro build/nitro-${{ steps.tag.outputs.name }}-mac-amd64
-          cd build
-          zip -r nitro-${{ steps.tag.outputs.name }}-mac-amd64.zip nitro-${{ steps.tag.outputs.name }}-mac-amd64
-          ls -la
-          cd ..
+          mkdir -p nitro && mkdir -p nitro/config
+          cp config.json nitro/config/
+          cp build/nitro nitro/
+          zip -r nitro.zip nitro
 
       - name: Upload binaries to release
         # if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: build/nitro-${{ steps.tag.outputs.name }}-mac-amd64.zip
-          asset_name: nitro-${{ steps.tag.outputs.name }}-mac-amd64.zip.zip
-          tag: ${{ steps.tag.outputs.name }}
+          file: build/nitro-${{ steps.extract_commit_id.outputs.sha_short }}-mac-amd64.zip
+          asset_name: nitro-${{ steps.extract_commit_id.outputs.sha_short }}-mac-amd64.zip.zip
+          tag: ${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_commit_id.outputs.sha_short }}