fix: silent make -C

cashapp · Apr 23, 2024 · 51f0890 · 51f0890
1 parent 8ad5a60
commit 51f0890
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
@@ -8,13 +8,13 @@ on:
         type: string
 jobs:
   pkg:
-    name: Build {{ inputs.package }}
+    name: Build
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}
     strategy:
       matrix:
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             # To ensure binaries built are compatible with Block's Kochiku worker environment
             container: centos:centos7
           - os: macos-12
@@ -37,18 +37,18 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Init Hermit
-        run: ./bin/hermit env --raw >> $GITHUB_ENV
+        uses: cashapp/activate-hermit@v1
       - name: Build
         id: build
         run: |
           if [ -f /opt/rh/devtoolset-11/enable ]; then . /opt/rh/devtoolset-11/enable; fi
           make -C pkgs/${{ inputs.package }}
-          # Output version for release action
-          echo "version=$(make -C pkgs/${{ inputs.package }} version)" >> $GITHUB_ENV
+          make -s -C pkgs/${{ inputs.package }} version
+          echo "VERSION=$(make -s -C pkgs/${{ inputs.package }} version)" >> $GITHUB_OUTPUT
       - name: Upload Release
         uses: ncipollo/release-action@v1
         with:
-          tag: ${{ inputs.package }}-${{ steps.build.outputs.version }}
+          tag: ${{ inputs.package }}-${{ steps.build.outputs.VERSION }}
           allowUpdates: true
-          artifacts: "pkgs/${{ inputs.package }}/${{ inputs.package }}-${{ steps.build.outputs.version }}-*.tar.xz"
+          artifacts: "pkgs/${{ inputs.package }}/${{ inputs.package }}-${{ steps.build.outputs.VERSION }}-*.tar.xz"
           token: ${{ secrets.GITHUB_TOKEN }}