Clean up builds

jqlang · May 31, 2023 · 2d367c1 · 2d367c1
1 parent 488dc8a
commit 2d367c1
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 54 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -34,10 +34,9 @@ jobs:
             cflags: '-Wnonnull'
     steps:
       - name: Clone repository
-        uses: actions/checkout@v1
-      - name: Open Submodule(s)
-        run: |
-          git submodule update --init --recursive
+        uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: Install packages
         run: |
           sudo apt-get update -qq
@@ -67,28 +66,17 @@ jobs:
         run: |
           ulimit -c unlimited
           make -j4 check
-      - name: Core dump stacks
-        run: |
-          echo "thread apply all bt" > /tmp/x
-          find . -name core -print | while read core; do gdb -batch -x x `file "$core"|sed -e "s/^[^']*'//" -e "s/[ '].*$//"` "$core"; done
-          if [ "$(find . -name core -print | wc -l)" -gt 0 ]; then false; fi
-      - name: Test logs
+      - name: Upload Test Logs
         if: ${{ failure() }}
-        run: |
-          cat test-suite.log
-          cat tests/*.log
-      - name: Upload Install Tarball
-        uses: actions/upload-artifact@v2
-        with:
-          name: Install Tarball
-          path: '~/jq-install-linux-${{ matrix.compiler }}.tgz'
-      - name: Upload Dist Tarball
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: Dist Tarball
-          path: 'jq-*.tar.gz'
-      - name: Upload Logs Tarball
-        uses: actions/upload-artifact@v2
+          name: test-logs
+          path: |
+            test-suite.log
+            tests/*.log
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
         with:
-          name: Test Logs
-          path: '~/logs-linux-${{ matrix.compiler }}.tgz'
+          name: jq-${{ matrix.name }}
+          path: |
+            jq
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -32,13 +32,11 @@ jobs:
             compiler: clang
     steps:
       - name: Clone repository
-        uses: actions/checkout@v1
-      - name: Open Submodule(s)
-        run: |
-          git submodule update --init --recursive
+        uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: Install packages
         run: |
-          uname -s
           brew update
           brew install autoconf automake libtool flex bison python3
           sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac
@@ -60,18 +58,17 @@ jobs:
         run: |
           ulimit -c unlimited
           make -j4 check
-      - name: Test logs
+      - name: Upload Test Logs
         if: ${{ failure() }}
-        run: |
-          cat test-suite.log
-          cat tests/*.log
-      - name: Upload Install Tarball
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: Install Tarball
-          path: '~/jq-install-osx-${{ matrix.compiler }}.tgz'
-      - name: Upload Logs Tarball
-        uses: actions/upload-artifact@v2
+          name: test-logs
+          path: |
+            test-suite.log
+            tests/*.log
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
         with:
-          name: Test Logs
-          path: '~/logs-osx-${{ matrix.compiler }}.tgz'
+          name: jq-${{ matrix.name }}
+          path: |
+            jq
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -43,17 +43,18 @@ jobs:
           autoreconf -fiv
           ./configure --disable-valgrind --with-oniguruma=builtin --disable-shared --enable-static --enable-all-static
           make -j4
-          make SUBDIRS="TESTS=tests/mantest tests/jqtest tests/onigtest tests/base64test" check
-          7z a jq-windows.zip jq.exe
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: jq artifacts
-          path: |
-            jq-windows.zip
+          make SUBDIRS="TESTS= tests/mantest tests/jqtest tests/onigtest tests/base64test" check
       - name: Upload Test Logs
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: Test logs
-          path: test-suite.log
+          name: test-logs
+          path: |
+            test-suite.log
+            tests/*.log
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: jq-windows
+          path: |
+            jq.exe