Skip to content

Commit a2e87f7

Browse files
committed
Clean up builds
1 parent 488dc8a commit a2e87f7

File tree

3 files changed

+39
-53
lines changed

3 files changed

+39
-53
lines changed

.github/workflows/linux.yml

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ jobs:
3434
cflags: '-Wnonnull'
3535
steps:
3636
- name: Clone repository
37-
uses: actions/checkout@v1
38-
- name: Open Submodule(s)
39-
run: |
40-
git submodule update --init --recursive
37+
uses: actions/checkout@v3
38+
with:
39+
submodules: true
4140
- name: Install packages
4241
run: |
4342
sudo apt-get update -qq
@@ -67,28 +66,17 @@ jobs:
6766
run: |
6867
ulimit -c unlimited
6968
make -j4 check
70-
- name: Core dump stacks
71-
run: |
72-
echo "thread apply all bt" > /tmp/x
73-
find . -name core -print | while read core; do gdb -batch -x x `file "$core"|sed -e "s/^[^']*'//" -e "s/[ '].*$//"` "$core"; done
74-
if [ "$(find . -name core -print | wc -l)" -gt 0 ]; then false; fi
75-
- name: Test logs
69+
- name: Upload Test Logs
7670
if: ${{ failure() }}
77-
run: |
78-
cat test-suite.log
79-
cat tests/*.log
80-
- name: Upload Install Tarball
81-
uses: actions/upload-artifact@v2
82-
with:
83-
name: Install Tarball
84-
path: '~/jq-install-linux-${{ matrix.compiler }}.tgz'
85-
- name: Upload Dist Tarball
86-
uses: actions/upload-artifact@v2
71+
uses: actions/upload-artifact@v3
8772
with:
88-
name: Dist Tarball
89-
path: 'jq-*.tar.gz'
90-
- name: Upload Logs Tarball
91-
uses: actions/upload-artifact@v2
73+
name: test-logs
74+
path: |
75+
test-suite.log
76+
tests/*.log
77+
- name: Upload Artifacts
78+
uses: actions/upload-artifact@v3
9279
with:
93-
name: Test Logs
94-
path: '~/logs-linux-${{ matrix.compiler }}.tgz'
80+
name: jq-${{ matrix.name }}
81+
path: |
82+
jq

.github/workflows/macos.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ jobs:
3232
compiler: clang
3333
steps:
3434
- name: Clone repository
35-
uses: actions/checkout@v1
36-
- name: Open Submodule(s)
37-
run: |
38-
git submodule update --init --recursive
35+
uses: actions/checkout@v3
36+
with:
37+
submodules: true
3938
- name: Install packages
4039
run: |
41-
uname -s
4240
brew update
4341
brew install autoconf automake libtool flex bison python3
4442
sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac
@@ -60,18 +58,17 @@ jobs:
6058
run: |
6159
ulimit -c unlimited
6260
make -j4 check
63-
- name: Test logs
61+
- name: Upload Test Logs
6462
if: ${{ failure() }}
65-
run: |
66-
cat test-suite.log
67-
cat tests/*.log
68-
- name: Upload Install Tarball
69-
uses: actions/upload-artifact@v2
63+
uses: actions/upload-artifact@v3
7064
with:
71-
name: Install Tarball
72-
path: '~/jq-install-osx-${{ matrix.compiler }}.tgz'
73-
- name: Upload Logs Tarball
74-
uses: actions/upload-artifact@v2
65+
name: test-logs
66+
path: |
67+
test-suite.log
68+
tests/*.log
69+
- name: Upload Artifacts
70+
uses: actions/upload-artifact@v3
7571
with:
76-
name: Test Logs
77-
path: '~/logs-osx-${{ matrix.compiler }}.tgz'
72+
name: jq-${{ matrix.name }}
73+
path: |
74+
jq

.github/workflows/windows.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,17 @@ jobs:
4444
./configure --disable-valgrind --with-oniguruma=builtin --disable-shared --enable-static --enable-all-static
4545
make -j4
4646
make SUBDIRS="TESTS=tests/mantest tests/jqtest tests/onigtest tests/base64test" check
47-
7z a jq-windows.zip jq.exe
48-
- name: Upload Artifacts
49-
uses: actions/upload-artifact@v2
50-
with:
51-
name: jq artifacts
52-
path: |
53-
jq-windows.zip
5447
- name: Upload Test Logs
5548
if: ${{ failure() }}
56-
uses: actions/upload-artifact@v2
49+
uses: actions/upload-artifact@v3
5750
with:
58-
name: Test logs
59-
path: test-suite.log
51+
name: test-logs
52+
path: |
53+
test-suite.log
54+
tests/*.log
55+
- name: Upload Artifacts
56+
uses: actions/upload-artifact@v3
57+
with:
58+
name: jq-windows
59+
path: |
60+
jq.exe

0 commit comments

Comments
 (0)