From 12eabf50de0acd257176d79775d9d673b4dfd46e Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Fri, 19 Jan 2024 17:07:26 -0600
Subject: [PATCH] CI: Build static and shared, publish headers and libjq too

---
 .github/workflows/ci.yml | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f65d0e1cf8..b82d003692 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,12 +91,15 @@ jobs:
             --disable-docs \
             --disable-valgrind \
             --with-oniguruma=builtin \
+            --enable-shared \
             --enable-static \
             --enable-all-static \
             CFLAGS="-O2 -pthread -fstack-protector-all"
           make -j"$(nproc)"
           file ./jq
-          cp ./jq jq-${{ env.SUFFIX }}
+          mkdir jq-${{ env.SUFFIX }}
+          cp ./jq src/jv.h src/jq.h .libs/libjq* libjq.pc jq-${{ env.SUFFIX }}
+          rm -f jq-${{ env.SUFFIX }}/libjq.la jq-${{ env.SUFFIX }}/libjq.lai
       - name: Test
         # Only run tests for amd64 matching the CI machine arch
         if: ${{ matrix.arch == 'amd64' }}
@@ -157,13 +160,16 @@ jobs:
             --disable-docs \
             --disable-valgrind \
             --with-oniguruma=builtin \
+            --enable-shared \
             --enable-static \
             --enable-all-static \
             CFLAGS="-O2 -pthread -fstack-protector-all"
           make -j"$(sysctl -n hw.logicalcpu)"
           strip ./jq
           file ./jq
-          cp ./jq jq-${{ env.SUFFIX }}
+          mkdir jq-${{ env.SUFFIX }}
+          cp -rp ./jq src/jv.h src/jq.h .libs/libjq* jq-${{ env.SUFFIX }}
+          rm -f jq-${{ env.SUFFIX }}/libjq.la jq-${{ env.SUFFIX }}/libjq.lai
       - name: Test
         # Only run tests for amd64 matching the CI machine arch
         if: ${{ matrix.arch == 'amd64' }}
@@ -233,13 +239,15 @@ jobs:
             --disable-docs \
             --disable-valgrind \
             --with-oniguruma=builtin \
-            --disable-shared \
+            --enable-shared \
             --enable-static \
             --enable-all-static \
             CFLAGS="-O2 -pthread -fstack-protector-all"
           make -j$(nproc)
           file ./jq.exe
-          cp ./jq.exe jq-${{ env.SUFFIX }}.exe
+          mkdir jq-${{ env.SUFFIX }}
+          cp ./jq.exe src/jv.h src/jq.h .libs/libjq* jq-${{ env.SUFFIX }}
+          rm -f jq-${{ env.SUFFIX }}/libjq.la jq-${{ env.SUFFIX }}/libjq.lai
       - name: Test
         run: |
           make check VERBOSE=yes
@@ -257,7 +265,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: jq-${{ env.SUFFIX }}
-          path: jq-${{ env.SUFFIX }}.exe
+          path: jq-${{ env.SUFFIX }}
           if-no-files-found: error
           retention-days: 7
 
@@ -308,14 +316,15 @@ jobs:
       - name: Move executables
         run: |
           mkdir -p linux/{386,amd64,arm64,mips64le,ppc64le,riscv64,s390x}
-          mv jq-linux-i386 linux/386/jq
-          mv jq-linux-amd64 linux/amd64/jq
-          mv jq-linux-arm64 linux/arm64/jq
-          mv jq-linux-mips64el linux/mips64le/jq
-          mv jq-linux-ppc64el linux/ppc64le/jq
-          mv jq-linux-riscv64 linux/riscv64/jq
-          mv jq-linux-s390x linux/s390x/jq
+          mv jq-linux-i386/* linux/386/
+          mv jq-linux-amd64/* linux/amd64/
+          mv jq-linux-arm64/* linux/arm64/
+          mv jq-linux-mips64el/* linux/mips64le/
+          mv jq-linux-ppc64el/* linux/ppc64le/
+          mv jq-linux-riscv64/* linux/riscv64/
+          mv jq-linux-s390x/* linux/s390x/
           chmod +x linux/*/jq
+          ls -F linux/{386,amd64,arm64,mips64le,ppc64le,riscv64,s390x}
       - name: Create Dockerfile
         run: |
           cat <<'EOF' >Dockerfile
@@ -373,6 +382,9 @@ jobs:
           TAG_NAME: ${{ github.ref_name }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          # These are for backwards compatibility with previous
+          # releases' URI local parts that get baked into users'
+          # recipes.
           cp jq-linux-amd64 jq-linux64
           cp jq-macos-amd64 jq-osx-amd64
           cp jq-windows-amd64.exe jq-win64.exe