refactor: Merge build workflows

kdheepak · Nov 13, 2024 · 018620f · 018620f
1 parent 0b12cb3
commit 018620f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 98 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,5 +1,7 @@
 name: Build
-on: [pull_request]
+on: 
+  pull_request:
+  workflow_call:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -11,9 +13,6 @@ jobs:
             target: x86_64-apple-darwin
             rust_flags: ''
             features: ''
-            binary_postfix: ''
-            upx_args: --best
-            strip: true
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             rust_flags: ''
@@ -66,7 +65,7 @@ jobs:
       - name: Compress binaries
         uses: svenstaro/upx-action@v2
         with:
-          file: target/${{ matrix.target }}/release/taskwarrior-tui${{ matrix.binary_postfix }}
+          files: target/${{ matrix.target }}/release/taskwarrior-tui${{ matrix.binary_postfix }}
           args: ${{ matrix.upx_args }}
           strip: ${{ matrix.strip }}
         # MacOS Compression disabled due to bug https://github.com/upx/upx/blob/44e4bd0b5454ff8aee1ff3376974dfe6014300d9/NEWS#L31  

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -11,99 +11,8 @@ permissions:
   contents: write
 
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macOS-latest
-            target: x86_64-apple-darwin
-            rust_flags: ""
-            features: ""
-            binary_postfix: ""
-            upx_args: --best
-            strip: true
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            rust_flags: ""
-            features: ""
-            binary_postfix: ""
-            upx_args: --best --lzma
-            strip: true
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-musl
-            rust_flags: ""
-            features: ""
-            binary: "taskwarrior-tui-x86_64-unknown-linux-musl"
-            upx_args: --best --lzma
-            strip: true
-          - os: windows-latest
-            target: x86_64-pc-windows-gnu
-            rust_flags: -C target-feature=+crt-static
-            features: ""
-            binary_postfix: ".exe"
-            upx_args: -9
-            strip: false
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-            rust_flags: -C target-feature=+crt-static
-            features: ""
-            binary_postfix: ".exe"
-            upx_args: -9
-            strip: false
-          - os: windows-latest
-            target: i686-pc-windows-msvc
-            rust_flags: -C target-feature=+crt-static
-            features: ""
-            binary_postfix: ".exe"
-            upx_args: -9
-            strip: false
-    env:
-      RUSTFLAGS: ${{ matrix.rust_flags }}
-      MACOSX_DEPLOYMENT_TARGET: 10.7
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-          override: true
-      - uses: clechasseur/rs-cargo@v2
-        with:
-          command: build
-          args: --release ${{matrix.features}} --target=${{ matrix.target }}
-      - name: Compress binaries
-        uses: svenstaro/upx-action@v2
-        with:
-          files: |
-            target/${{ matrix.target }}/release/taskwarrior-tui${{ matrix.binary_postfix }}
-          args: ${{ matrix.upx_args }}
-          strip: ${{ matrix.strip }}
-      - name: Packaging binary
-        shell: bash
-        run: |
-          cd target/${{ matrix.target }}/release
-          tar czvf taskwarrior-tui-${{ matrix.target }}.tar.gz taskwarrior-tui${{ matrix.binary_postfix }}
-          if [[ ${{ runner.os }} == 'Windows' ]]; then
-            certutil -hashfile taskwarrior-tui-${{ matrix.target }}.tar.gz sha256 | grep -E [A-Fa-f0-9]{64} > taskwarrior-tui-${{ matrix.target }}.sha256
-          else
-            shasum -a 256 taskwarrior-tui-${{ matrix.target }}.tar.gz > taskwarrior-tui-${{ matrix.target }}.sha256
-          fi
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: taskwarrior-tui-${{ matrix.target }}
-          path: target/${{ matrix.target }}/release/taskwarrior-tui-${{ matrix.target }}.tar.gz
-      - name: Releasing assets
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
-        with:
-          files: |
-            target/${{ matrix.target }}/release/taskwarrior-tui-${{ matrix.target }}.tar.gz
-            target/${{ matrix.target }}/release/taskwarrior-tui-${{ matrix.target }}.sha256
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  call_build:
+    uses: ./.github/workflows/build.yml
 
   homebrew:
     name: Bump Homebrew formula