Fix some commands

qqfunc · Aug 18, 2024 · 0f2ebea · 0f2ebea
1 parent 6acaf89
commit 0f2ebea
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -67,17 +67,14 @@ jobs:
       with:
         path: ${{ github.workspace }}/install/bz2
         key: bz2-${{ matrix.build.sdk }}-${{ matrix.build.arch }}
-    - name: Download bzip2
-      id: dl
+    - name: Download bzip2 source
       if: ${{ steps.cache.outputs.cache-hit != 'true' }}
       run: |
         curl -O https://www.sourceware.org/pub/bzip2/bzip2-latest.tar.gz
-        tar -xzf bzip2-latest.tar.gz
-        echo "ver=$(ls bzip2-* | cut -d- -f2 | head -n1)" >> $GITHUB_OUTPUT
-        echo "dir=$(ls bzip2-* | head -n1)" >> $GITHUB_OUTPUT
+        tar -xzf bzip2-latest.tar.gz -C bzip2 --strip-components 1
     - name: Build bzip2
       if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-      working-directory: ${{ steps.dl.outputs.dir }}
+      working-directory: bzip2
       run: >
         make install
         PREFIX="${{ github.workspace }}/install/bz2"
@@ -141,6 +138,7 @@ jobs:
       run: >
         ./configure
         --prefix="${{ github.workspace }}/install/ffi"
+        --host=${{ matrix.build.host }}
         CC="xcrun --sdk ${{ matrix.build.sdk }} clang -target ${{ matrix.build.host }}"
         CFLAGS="--sysroot=$(xcrun --sdk ${{ matrix.build.sdk }} --show-sdk-path) -mios-version-min=${{ needs.fetch.outputs.ios }}"
         LDFLAGS="-isysroot $(xcrun --sdk ${{ matrix.build.sdk }} --show-sdk-path) -mios-version-min=${{ needs.fetch.outputs.ios }}"
@@ -185,7 +183,7 @@ jobs:
         key: xz-${{ matrix.build.sdk }}-${{ matrix.build.arch }}
     - name: Download XZ Utils source
       if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-      run: |
+      run: >
         gh release
         -R tukaani-project/xz
         download v${{ needs.fetch.outputs.xz }}