try autoconf on macos

pmqs · Aug 6, 2023 · fa83e10 · fa83e10
1 parent 705b541
commit fa83e10
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 28 deletions.
diff --git a/.github/workflows/linux-upstream-gh-xz.yml b/.github/workflows/linux-upstream-gh-xz.yml
@@ -113,4 +113,4 @@ jobs:
         perl Makefile.PL && make
 
     - name: Test
-      run: make test TEST_VERBOSE=1
+      run: make test
diff --git a/.github/workflows/macos-upstream-gh-xz.yml b/.github/workflows/macos-upstream-gh-xz.yml
@@ -54,14 +54,12 @@ jobs:
       with:
         # NOTE: path doesn't expand variables!
         path: /home/runner/upstream-lzma-install
-        # path: /home/runner/upstream-lzma-install-${{ matrix.lzma-version }}
         key: ${{ runner.os }}-lzma-${{ matrix.lzma-version }}
 
-    #   # Install Autotools on Linux
-    # - name: Install autogen Dependencies
-    #   run: |
-    #     sudo apt-get update
-    #     sudo apt-get install -y autoconf automake build-essential po4a autopoint gcc-multilib doxygen
+      # Install Autotools on Mac
+    - name: Install Dependencies
+      if: ${{ matrix.os == 'macos-latest'
+      run: brew install autoconf automake libtool po4a doxygen
 
     - name: Checkout upstream lzma ${{matrix.lzma-version}}
       if: steps.cache-lzma.outputs.cache-hit != 'true'
@@ -72,29 +70,30 @@ jobs:
         path: ${{ env.lzma-source }}
 
     # Configure-based build
-    # - name: Build lzma ${{matrix.lzma-version}}
-    #   run: |
-    #     # Run autogen.sh script if not already run
-    #     if [ ! -f configure ]
-    #     then
-    #       ./autogen.sh
-    #     fi
-    #     ./configure --prefix ${{ env.lzma-install }}
-    #     make
-    #     make check
-    #     make install
-    #   working-directory: ${{ env.lzma-source }}
-
-    # CMake-based build
     - name: Build lzma ${{matrix.lzma-version}}
       if: steps.cache-lzma.outputs.cache-hit != 'true'
       run: |
-        mkdir ${HOME}/build-xz
-        cd ${HOME}/build-xz
-        cmake ${{ env.lzma-source }}/CMakeLists.txt -B . --install-prefix ${{ env.lzma-install }} -DBUILD_SHARED_LIBS=ON
-        cmake --build .
-        cmake --install .
-        rm -fr ${HOME}/build-xz
+        # Run autogen.sh script if not already run
+        if [ ! -f configure ]
+        then
+          ./autogen.sh
+        fi
+        ./configure --prefix ${{ env.lzma-install }}
+        make
+        make check
+        make install
+      working-directory: ${{ env.lzma-source }}
+
+    # # CMake-based build
+    # - name: Build lzma ${{matrix.lzma-version}}
+    #   if: steps.cache-lzma.outputs.cache-hit != 'true'
+    #   run: |
+    #     mkdir ${HOME}/build-xz
+    #     cd ${HOME}/build-xz
+    #     cmake ${{ env.lzma-source }}/CMakeLists.txt -B . --install-prefix ${{ env.lzma-install }} -DBUILD_SHARED_LIBS=ON
+    #     cmake --build .
+    #     cmake --install .
+    #     rm -fr ${HOME}/build-xz
 
     - name: Setup perl
       uses: shogo82148/actions-setup-perl@v1
@@ -113,4 +112,4 @@ jobs:
         perl Makefile.PL && make
 
     - name: Test
-      run: make test TEST_VERBOSE=1
+      run: make test