From 19c703084c4033bcae824abc457bf82808532d19 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Thu, 7 Jul 2022 15:48:41 -0500 Subject: [PATCH 01/22] Try making some GitHub Actions --- .github/workflows/linux.yml | 102 ++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 .github/workflows/linux.yml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 0000000000..6dafd7ed97 --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,102 @@ +name: Linux Build + +on: + push: + branches: + - 'master' + paths: + - '!docs/**' + - '!**.md' + - '!appveyor.yml' + - '!.travis.yml' + - '.github/workflows/linux.yml' + + pull_request: + paths: + - '!docs/**' + - '!**.md' + - '!appveyor.yml' + - '!.travis.yml' + - '.github/workflows/linux.yml' + +jobs: + unix: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + name: [linux-clang, linux-gcc] + include: + - name: linux-clang + os: ubuntu-18.04 + compiler: clang + cflags: '' + - name: linux-gcc + os: ubuntu-18.04 + compiler: gcc + cflags: '-Wnonnull' + steps: + - name: Clone repository + uses: actions/checkout@v1 + - name: Open Submodule(s) + run: | + git submodule update --init --recursive + - name: Install packages + if: startsWith(matrix.os, 'ubuntu') + run: | + sudo apt-get update -qq + sudo apt-get install -y automake autoconf bison flex gdb python valgrind + - name: Prep + run: | + #pyenv global 3.6.7 + #pip3 install pipenv + #(cd docs && pipenv sync) + #if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi + echo SHELL=$SHELL + echo PATH=$PATH + which bison + bison --version + + - name: Build + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + run: | + autoreconf -fi + rm src/lexer.c src/lexer.h + rm src/parser.c src/parser.h + ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE + make -j4 + make dist + - name: Test + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + 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 + 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 + with: + name: Dist Tarball + path: 'jq-*.tar.gz' + - name: Upload Logs Tarball + uses: actions/upload-artifact@v2 + with: + name: Test Logs + path: '~/logs-linux-${{ matrix.compiler }}.tgz' From 7cbf0b2a9232302012534be35f3b3644d756182a Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Sun, 30 Oct 2022 21:32:15 -0500 Subject: [PATCH 02/22] GHA: Add OS X, Windows, and Linux w/ scan-build builds --- .github/workflows/osx.yml | 93 +++++++++++++++++++++++++++++++++ .github/workflows/scanbuild.yml | 77 +++++++++++++++++++++++++++ .github/workflows/windows.yml | 75 ++++++++++++++++++++++++++ 3 files changed, 245 insertions(+) create mode 100644 .github/workflows/osx.yml create mode 100644 .github/workflows/scanbuild.yml create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml new file mode 100644 index 0000000000..602ddcce67 --- /dev/null +++ b/.github/workflows/osx.yml @@ -0,0 +1,93 @@ +name: OS X Build + +on: + push: + branches: + - 'master' + - 'osx-build' + paths: + - '!docs/**' + - '!**.md' + - '!appveyor.yml' + - '!.travis.yml' + - '.github/workflows/osx.yml' + + pull_request: + paths: + - '!docs/**' + - '!**.md' + - '!appveyor.yml' + - '!.travis.yml' + - '.github/workflows/osx.yml' + +jobs: + unix: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + name: [osx-clang] + include: + - name: osx-clang + os: ubuntu-18.04 + compiler: clang + cflags: '' + steps: + - name: Clone repository + uses: actions/checkout@v1 + - name: Open Submodule(s) + run: | + git submodule update --init --recursive + - name: Install packages + if: startsWith(matrix.os, 'ubuntu') + run: | + uname -s + brew update + brew install flex bison + brew upgrade pyenv + pyenv install -s 3.6.7 + rm src/{lexer,parser}.{c,h} + sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac + - name: Prep + run: | + #pyenv global 3.6.7 + #pip3 install pipenv + #(cd docs && pipenv sync) + #if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi + echo SHELL=$SHELL + echo PATH=$PATH + which bison + bison --version + + - name: Build + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + run: | + autoreconf -fi + rm src/lexer.c src/lexer.h + rm src/parser.c src/parser.h + ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE + make -j4 + - name: Test + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + run: | + ulimit -c unlimited + make -j4 check + - name: 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-osx-${{ matrix.compiler }}.tgz' + - name: Upload Logs Tarball + uses: actions/upload-artifact@v2 + with: + name: Test Logs + path: '~/logs-osx-${{ matrix.compiler }}.tgz' diff --git a/.github/workflows/scanbuild.yml b/.github/workflows/scanbuild.yml new file mode 100644 index 0000000000..6247a7da83 --- /dev/null +++ b/.github/workflows/scanbuild.yml @@ -0,0 +1,77 @@ +name: Linux Clang scan-build Static Analyzer Build + +on: + # Don't do this for PRs. It eats up minutes. + push: + branches: + - 'master' + - 'scan-build' + paths: + - '.github/workflows/scanbuild.yml' + +jobs: + unix: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + name: [linux-clang] + include: + - name: linux-clang + os: ubuntu-18.04 + compiler: clang + cflags: '' + steps: + - name: Clone repository + uses: actions/checkout@v1 + - name: Open Submodule(s) + run: | + git submodule update --init --recursive + - name: Install packages + if: startsWith(matrix.os, 'ubuntu') + run: | + sudo apt-get update -qq + sudo apt-get install -y automake autoconf bison flex gdb python valgrind clang-tools + - name: Prep + run: | + #pyenv global 3.6.7 + #pip3 install pipenv + #(cd docs && pipenv sync) + #if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi + echo SHELL=$SHELL + echo PATH=$PATH + which bison + bison --version + + - name: Build + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + run: | + autoreconf -fi + rm src/lexer.c src/lexer.h + rm src/parser.c src/parser.h + ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE + scan-build --keep-going make -j4 + - name: Test + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + run: | + ulimit -c unlimited + scan-build --keep-going 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 + if: ${{ failure() }} + run: | + cat test-suite.log + cat tests/*.log + - name: Upload Logs + uses: actions/upload-artifact@v2 + with: + name: Scan-Build Reports + path: '/tmp/scan-build*/' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000000..62a4722e5f --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,75 @@ +name: Windows Build + +on: + push: + branches: + - 'master' + - 'windows-build' + paths: + - '**.[chly]' + - '**/Makefile.am' + - '.github/workflows/windows.yml' + + pull_request: + paths: + - '**.[chly]' + - '**/Makefile.am' + - '.github/workflows/windows.yml' + +jobs: + windows: + runs-on: windows-latest + env: + APPVER: '10.0' + CODESIGN_PKT: 0000000000000000 + INSTALL_DIR: C:\jq + WINSDKVER: '10.0.22000.0' + WIXDIR: 'c:\Program Files (x86)\Windows Installer XML v3.5' + steps: + - name: Clone repository + uses: actions/checkout@v1 + - name: Find MSVC and run vcvarsall.bat + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64 + - uses: msys2/setup-msys2@v2 + with: + update: true + install: >- + base-devel + git + #- name: Set up MinGW + # uses: egor-tensin/setup-mingw@v2 + # with: + # platform: x64 + - name: Build and Test + shell: cmd + run: | + title jq Build %CPU% %dbg__type% + git submodule update --init --recursive + mkdir %INSTALL_DIR% + pacman --noconfirm -S autoconf + pacman --noconfirm -S automake + pacman --noconfirm -S bison + set "PATH=%PATH%;C:\msys64\usr\bin;C:\cygwin\bin" + set "PATH=%PATH%;C:\tools\cygwin\bin" + echo PATH=%PATH% + # Make + autoreconf -fi + ./configure --with-oniguruma=builtin --disable-shared --enable-static --enable-all-static + make + 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: Zip file + path: jq-windows.zip + name: Executable + path: jq.exe + - name: Upload Test Logs + if: true + uses: actions/upload-artifact@v2 + with: + name: Test logs + path: test-suite.log From 30a9087c0a48de6fc5c87f792e9609baf2e5e806 Mon Sep 17 00:00:00 2001 From: Owen Ou <169064+owenthereal@users.noreply.github.com> Date: Wed, 17 May 2023 13:08:58 -0700 Subject: [PATCH 03/22] Add link to discord server Add link to discord server --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 44acd13bd2..2388e318c6 100644 --- a/README.md +++ b/README.md @@ -72,4 +72,8 @@ cross-compilation environment. See also ["Cross compilation"](https://github.com/jqlang/jq/wiki/Cross-compilation) on the wiki. -Send questions to https://stackoverflow.com/questions/tagged/jq or to the #jq channel (https://web.libera.chat/#jq) on Libera.Chat (https://libera.chat/). + +# Community + +* Send questions to https://stackoverflow.com/questions/tagged/jq. +* Join our [Discord server](https://discord.gg/yg6yjNmgAC). From 627a609592e6982f4f175d0ee1bc71f84b302aa0 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 09:20:04 -0700 Subject: [PATCH 04/22] Update Ubuntu to 22.04 for GitHub Actions --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6dafd7ed97..87624ff8f2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -28,11 +28,11 @@ jobs: name: [linux-clang, linux-gcc] include: - name: linux-clang - os: ubuntu-18.04 + os: ubuntu-22.04 compiler: clang cflags: '' - name: linux-gcc - os: ubuntu-18.04 + os: ubuntu-22.04 compiler: gcc cflags: '-Wnonnull' steps: From 1d24c173e5fa065b522bc4a931b2fecbbdd9f567 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 09:21:26 -0700 Subject: [PATCH 05/22] Remove if condition for Ubuntu build --- .github/workflows/linux.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 87624ff8f2..559dbe6309 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,6 @@ jobs: run: | git submodule update --init --recursive - name: Install packages - if: startsWith(matrix.os, 'ubuntu') run: | sudo apt-get update -qq sudo apt-get install -y automake autoconf bison flex gdb python valgrind From 1cacabdcf80d6b907ba83cb8c239e7ce39b0b071 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 09:22:35 -0700 Subject: [PATCH 06/22] Fix MacOS OS on GitHub Actions --- .github/workflows/osx.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 602ddcce67..43b2e94f00 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -29,7 +29,11 @@ jobs: name: [osx-clang] include: - name: osx-clang - os: ubuntu-18.04 + os: macos-12 + compiler: clang + cflags: '' + - name: osx-clang + os: macos-13 compiler: clang cflags: '' steps: @@ -39,7 +43,6 @@ jobs: run: | git submodule update --init --recursive - name: Install packages - if: startsWith(matrix.os, 'ubuntu') run: | uname -s brew update From 126ec778b4f4ab8413b6f4aa13c73fd5d98b092c Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 09:53:21 -0700 Subject: [PATCH 07/22] Fix python3 package on GitHub Actions --- .github/workflows/linux.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 559dbe6309..f2df8e3d9f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -44,13 +44,16 @@ jobs: - name: Install packages run: | sudo apt-get update -qq - sudo apt-get install -y automake autoconf bison flex gdb python valgrind + sudo apt-get install -y \ + automake \ + autoconf \ + bison \ + flex \ + gdb \ + python3 \ + valgrind - name: Prep run: | - #pyenv global 3.6.7 - #pip3 install pipenv - #(cd docs && pipenv sync) - #if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi echo SHELL=$SHELL echo PATH=$PATH which bison From 752b4bfcd94c4869cf34bb50f3ac59902fe06aeb Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 10:05:13 -0700 Subject: [PATCH 08/22] Disalbe valgrind Getting failed tests: https://github.com/jqlang/jq/actions/runs/5113866588/jobs/9193542140#step:9:341 --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f2df8e3d9f..2558e4fff4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -67,7 +67,7 @@ jobs: autoreconf -fi rm src/lexer.c src/lexer.h rm src/parser.c src/parser.h - ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE + ./configure --disable-valgrind --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE make -j4 make dist - name: Test From 3e4f435391eb92e4aa5678ea164f0018e122ec6e Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 10:12:06 -0700 Subject: [PATCH 09/22] Format file --- .github/workflows/linux.yml | 192 +++++++++++++++++------------------- 1 file changed, 91 insertions(+), 101 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2558e4fff4..dbdfded4a8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,104 +1,94 @@ name: Linux Build - on: - push: - branches: - - 'master' - paths: - - '!docs/**' - - '!**.md' - - '!appveyor.yml' - - '!.travis.yml' - - '.github/workflows/linux.yml' - - pull_request: - paths: - - '!docs/**' - - '!**.md' - - '!appveyor.yml' - - '!.travis.yml' - - '.github/workflows/linux.yml' - + push: + branches: + - 'master' + paths: + - '!docs/**' + - '!**.md' + - '!appveyor.yml' + - '!.travis.yml' + - '.github/workflows/linux.yml' + pull_request: + paths: + - '!docs/**' + - '!**.md' + - '!appveyor.yml' + - '!.travis.yml' + - '.github/workflows/linux.yml' jobs: - unix: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - name: [linux-clang, linux-gcc] - include: - - name: linux-clang - os: ubuntu-22.04 - compiler: clang - cflags: '' - - name: linux-gcc - os: ubuntu-22.04 - compiler: gcc - cflags: '-Wnonnull' - steps: - - name: Clone repository - uses: actions/checkout@v1 - - name: Open Submodule(s) - run: | - git submodule update --init --recursive - - name: Install packages - run: | - sudo apt-get update -qq - sudo apt-get install -y \ - automake \ - autoconf \ - bison \ - flex \ - gdb \ - python3 \ - valgrind - - name: Prep - run: | - echo SHELL=$SHELL - echo PATH=$PATH - which bison - bison --version - - - name: Build - env: - CC: ${{ matrix.compiler }} - MAKEVARS: ${{ matrix.makevars }} - run: | - autoreconf -fi - rm src/lexer.c src/lexer.h - rm src/parser.c src/parser.h - ./configure --disable-valgrind --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE - make -j4 - make dist - - name: Test - env: - CC: ${{ matrix.compiler }} - MAKEVARS: ${{ matrix.makevars }} - 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 - 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 - with: - name: Dist Tarball - path: 'jq-*.tar.gz' - - name: Upload Logs Tarball - uses: actions/upload-artifact@v2 - with: - name: Test Logs - path: '~/logs-linux-${{ matrix.compiler }}.tgz' + unix: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + name: [linux-clang, linux-gcc] + include: + - name: linux-clang + os: ubuntu-22.04 + compiler: clang + cflags: '' + - name: linux-gcc + os: ubuntu-22.04 + compiler: gcc + cflags: '-Wnonnull' + steps: + - name: Clone repository + uses: actions/checkout@v1 + - name: Open Submodule(s) + run: | + git submodule update --init --recursive + - name: Install packages + run: | + sudo apt-get update -qq + sudo apt-get install -y \ + automake \ + autoconf \ + bison \ + flex \ + gdb \ + python3 \ + valgrind + - name: Build + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + run: | + autoreconf -fi + rm src/lexer.c src/lexer.h + rm src/parser.c src/parser.h + ./configure --disable-valgrind --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE + make -j4 + make dist + - name: Test + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + 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 + 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 + with: + name: Dist Tarball + path: 'jq-*.tar.gz' + - name: Upload Logs Tarball + uses: actions/upload-artifact@v2 + with: + name: Test Logs + path: '~/logs-linux-${{ matrix.compiler }}.tgz' From 55d381e749bbbb176a1d2745c504df5c0e2b7ebb Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 10:16:07 -0700 Subject: [PATCH 10/22] Fix macos build --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 77 +++++++++++++++++++++++++++++ .github/workflows/osx.yml | 96 ------------------------------------- 3 files changed, 78 insertions(+), 97 deletions(-) create mode 100644 .github/workflows/macos.yml delete mode 100644 .github/workflows/osx.yml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index dbdfded4a8..addbe31047 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,7 +17,7 @@ on: - '!.travis.yml' - '.github/workflows/linux.yml' jobs: - unix: + linux: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 0000000000..1bef23a9f4 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,77 @@ +name: MacOS Build +on: + push: + branches: + - 'master' + paths: + - '!docs/**' + - '!**.md' + - '!appveyor.yml' + - '!.travis.yml' + - '.github/workflows/macos.yml' + pull_request: + paths: + - '!docs/**' + - '!**.md' + - '!appveyor.yml' + - '!.travis.yml' + - '.github/workflows/macos.yml' +jobs: + macos: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + name: [macos-12-clang, macos-13-clang] + include: + - name: macos-12-clang + os: macos-12 + compiler: clang + - name: macos-13-clang + os: macos-13 + compiler: clang + steps: + - name: Clone repository + uses: actions/checkout@v1 + - name: Open Submodule(s) + run: | + git submodule update --init --recursive + - 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 + - name: Build + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + run: | + autoreconf -fi + rm src/lexer.c src/lexer.h + rm src/parser.c src/parser.h + ./configure --disable-valgrind --with-oniguruma=builtin YACC="$(brew --prefix)/opt/bison/bin/bison -y" $COVERAGE + make -j4 + make dist + - name: Test + env: + CC: ${{ matrix.compiler }} + MAKEVARS: ${{ matrix.makevars }} + run: | + ulimit -c unlimited + make -j4 check + - name: 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-osx-${{ matrix.compiler }}.tgz' + - name: Upload Logs Tarball + uses: actions/upload-artifact@v2 + with: + name: Test Logs + path: '~/logs-osx-${{ matrix.compiler }}.tgz' diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml deleted file mode 100644 index 43b2e94f00..0000000000 --- a/.github/workflows/osx.yml +++ /dev/null @@ -1,96 +0,0 @@ -name: OS X Build - -on: - push: - branches: - - 'master' - - 'osx-build' - paths: - - '!docs/**' - - '!**.md' - - '!appveyor.yml' - - '!.travis.yml' - - '.github/workflows/osx.yml' - - pull_request: - paths: - - '!docs/**' - - '!**.md' - - '!appveyor.yml' - - '!.travis.yml' - - '.github/workflows/osx.yml' - -jobs: - unix: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - name: [osx-clang] - include: - - name: osx-clang - os: macos-12 - compiler: clang - cflags: '' - - name: osx-clang - os: macos-13 - compiler: clang - cflags: '' - steps: - - name: Clone repository - uses: actions/checkout@v1 - - name: Open Submodule(s) - run: | - git submodule update --init --recursive - - name: Install packages - run: | - uname -s - brew update - brew install flex bison - brew upgrade pyenv - pyenv install -s 3.6.7 - rm src/{lexer,parser}.{c,h} - sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac - - name: Prep - run: | - #pyenv global 3.6.7 - #pip3 install pipenv - #(cd docs && pipenv sync) - #if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi - echo SHELL=$SHELL - echo PATH=$PATH - which bison - bison --version - - - name: Build - env: - CC: ${{ matrix.compiler }} - MAKEVARS: ${{ matrix.makevars }} - run: | - autoreconf -fi - rm src/lexer.c src/lexer.h - rm src/parser.c src/parser.h - ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE - make -j4 - - name: Test - env: - CC: ${{ matrix.compiler }} - MAKEVARS: ${{ matrix.makevars }} - run: | - ulimit -c unlimited - make -j4 check - - name: 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-osx-${{ matrix.compiler }}.tgz' - - name: Upload Logs Tarball - uses: actions/upload-artifact@v2 - with: - name: Test Logs - path: '~/logs-osx-${{ matrix.compiler }}.tgz' From d75fbefff81f1d6f70617b5be59a140f6f6d6b44 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 11:07:25 -0700 Subject: [PATCH 11/22] Fix syntax errors of windows build https://github.com/jqlang/jq/actions/runs/5114162556/workflow --- .github/workflows/windows.yml | 140 +++++++++++++++++----------------- 1 file changed, 68 insertions(+), 72 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 62a4722e5f..2e4e46d79a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,75 +1,71 @@ name: Windows Build - on: - push: - branches: - - 'master' - - 'windows-build' - paths: - - '**.[chly]' - - '**/Makefile.am' - - '.github/workflows/windows.yml' - - pull_request: - paths: - - '**.[chly]' - - '**/Makefile.am' - - '.github/workflows/windows.yml' - + push: + branches: + - 'master' + - 'windows-build' + paths: + - '**.[chly]' + - '**/Makefile.am' + - '.github/workflows/windows.yml' + pull_request: + paths: + - '**.[chly]' + - '**/Makefile.am' + - '.github/workflows/windows.yml' jobs: - windows: - runs-on: windows-latest - env: - APPVER: '10.0' - CODESIGN_PKT: 0000000000000000 - INSTALL_DIR: C:\jq - WINSDKVER: '10.0.22000.0' - WIXDIR: 'c:\Program Files (x86)\Windows Installer XML v3.5' - steps: - - name: Clone repository - uses: actions/checkout@v1 - - name: Find MSVC and run vcvarsall.bat - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: amd64 - - uses: msys2/setup-msys2@v2 - with: - update: true - install: >- - base-devel - git - #- name: Set up MinGW - # uses: egor-tensin/setup-mingw@v2 - # with: - # platform: x64 - - name: Build and Test - shell: cmd - run: | - title jq Build %CPU% %dbg__type% - git submodule update --init --recursive - mkdir %INSTALL_DIR% - pacman --noconfirm -S autoconf - pacman --noconfirm -S automake - pacman --noconfirm -S bison - set "PATH=%PATH%;C:\msys64\usr\bin;C:\cygwin\bin" - set "PATH=%PATH%;C:\tools\cygwin\bin" - echo PATH=%PATH% - # Make - autoreconf -fi - ./configure --with-oniguruma=builtin --disable-shared --enable-static --enable-all-static - make - 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: Zip file - path: jq-windows.zip - name: Executable - path: jq.exe - - name: Upload Test Logs - if: true - uses: actions/upload-artifact@v2 - with: - name: Test logs - path: test-suite.log + windows: + runs-on: windows-latest + env: + APPVER: '10.0' + CODESIGN_PKT: 0000000000000000 + INSTALL_DIR: C:\jq + WINSDKVER: '10.0.22000.0' + WIXDIR: 'c:\Program Files (x86)\Windows Installer XML v3.5' + steps: + - name: Clone repository + uses: actions/checkout@v1 + - name: Find MSVC and run vcvarsall.bat + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64 + - uses: msys2/setup-msys2@v2 + with: + update: true + install: >- + base-devel git + #- name: Set up MinGW + # uses: egor-tensin/setup-mingw@v2 + # with: + # platform: x64 + - name: Build and Test + shell: cmd + run: | + title jq Build %CPU% %dbg__type% + git submodule update --init --recursive + mkdir %INSTALL_DIR% + pacman --noconfirm -S autoconf + pacman --noconfirm -S automake + pacman --noconfirm -S bison + set "PATH=%PATH%;C:\msys64\usr\bin;C:\cygwin\bin" + set "PATH=%PATH%;C:\tools\cygwin\bin" + echo PATH=%PATH% + # Make + autoreconf -fi + ./configure --disable-valgrind --with-oniguruma=builtin --disable-shared --enable-static --enable-all-static + make + 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 + jq.exe + - name: Upload Test Logs + if: true + uses: actions/upload-artifact@v2 + with: + name: Test logs + path: test-suite.log From 125e38ba6cc3ca093d049814edd8be0ef82f2734 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 11:13:29 -0700 Subject: [PATCH 12/22] Install windows package with choco --- .github/workflows/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2e4e46d79a..8ad065573f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -44,9 +44,8 @@ jobs: title jq Build %CPU% %dbg__type% git submodule update --init --recursive mkdir %INSTALL_DIR% - pacman --noconfirm -S autoconf - pacman --noconfirm -S automake - pacman --noconfirm -S bison + choco install gnuwin32-m4 + choco install winflexbison set "PATH=%PATH%;C:\msys64\usr\bin;C:\cygwin\bin" set "PATH=%PATH%;C:\tools\cygwin\bin" echo PATH=%PATH% From 589d75a47a6b4dfed98bea6057b6416f3ed3c859 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 11:49:28 -0700 Subject: [PATCH 13/22] Pin oniguruma to 5a24a49d710a9e3bb8ff11d12e1eae5a9f9df40c MacOS build [fails](https://github.com/jqlang/jq/actions/runs/5114162555/jobs/9194126677#step:6:3160) due to ``` posix.c:94:3: error: implicit declaration of function 'onig_end' is invalid in C99 [-Werror,-Wimplicit-function-declaration] onig_end(); ``` The current `oniguruma` revision 6fa38f4084b448592888ed9ee43c6e90a46b5f5c (15 Mar 2017) lacks the following explicit declaration in src/onigposix.h: ``` ONIG_EXTERN int onig_end P_((void)); ``` This was added to oniguruma in revision 5a24a49d710a9e3bb8ff11d12e1eae5a9f9df40c (8 Sep 2017). Ref: https://github.com/jqlang/jq/issues/2381 --- modules/oniguruma | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/oniguruma b/modules/oniguruma index 6fa38f4084..5a24a49d71 160000 --- a/modules/oniguruma +++ b/modules/oniguruma @@ -1 +1 @@ -Subproject commit 6fa38f4084b448592888ed9ee43c6e90a46b5f5c +Subproject commit 5a24a49d710a9e3bb8ff11d12e1eae5a9f9df40c From 8d71666ac5986c9dce37b8ceb32c102badab49e3 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 12:15:54 -0700 Subject: [PATCH 14/22] Revert windows build to use pacman --- .github/workflows/windows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8ad065573f..2e4e46d79a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -44,8 +44,9 @@ jobs: title jq Build %CPU% %dbg__type% git submodule update --init --recursive mkdir %INSTALL_DIR% - choco install gnuwin32-m4 - choco install winflexbison + pacman --noconfirm -S autoconf + pacman --noconfirm -S automake + pacman --noconfirm -S bison set "PATH=%PATH%;C:\msys64\usr\bin;C:\cygwin\bin" set "PATH=%PATH%;C:\tools\cygwin\bin" echo PATH=%PATH% From 088ce2f9b1f5d10105a58bbfb9631cbc57c78067 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 12:21:03 -0700 Subject: [PATCH 15/22] Don't zip jq.exe --- .github/workflows/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2e4e46d79a..2f14bc3349 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -55,7 +55,6 @@ jobs: ./configure --disable-valgrind --with-oniguruma=builtin --disable-shared --enable-static --enable-all-static make 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: From 25b7327fe332962545335f58248995a40ef5603b Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Mon, 29 May 2023 12:22:34 -0700 Subject: [PATCH 16/22] Fixing windows build --- .github/workflows/windows.yml | 40 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2f14bc3349..2026eb5077 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,6 +13,7 @@ on: - '**.[chly]' - '**/Makefile.am' - '.github/workflows/windows.yml' + workflow_dispatch: jobs: windows: runs-on: windows-latest @@ -24,46 +25,35 @@ jobs: WIXDIR: 'c:\Program Files (x86)\Windows Installer XML v3.5' steps: - name: Clone repository - uses: actions/checkout@v1 - - name: Find MSVC and run vcvarsall.bat - uses: ilammy/msvc-dev-cmd@v1 + uses: actions/checkout@v3 with: - arch: amd64 + submodules: true - uses: msys2/setup-msys2@v2 with: update: true install: >- - base-devel git - #- name: Set up MinGW - # uses: egor-tensin/setup-mingw@v2 - # with: - # platform: x64 - - name: Build and Test - shell: cmd + base-devel + git + clang + autoconf + automake + libtool + p7zip + - shell: msys2 {0} run: | - title jq Build %CPU% %dbg__type% - git submodule update --init --recursive - mkdir %INSTALL_DIR% - pacman --noconfirm -S autoconf - pacman --noconfirm -S automake - pacman --noconfirm -S bison - set "PATH=%PATH%;C:\msys64\usr\bin;C:\cygwin\bin" - set "PATH=%PATH%;C:\tools\cygwin\bin" - echo PATH=%PATH% - # Make - autoreconf -fi + autoreconf -fiv ./configure --disable-valgrind --with-oniguruma=builtin --disable-shared --enable-static --enable-all-static - make + 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 - jq.exe - name: Upload Test Logs - if: true + if: ${{ failure() }} uses: actions/upload-artifact@v2 with: name: Test logs From 79d5eb9a245701f5b86ab1c7209dcd400cf02df4 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Tue, 30 May 2023 09:10:02 -0700 Subject: [PATCH 17/22] Update .gitattriutes for eol on Windows --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 596615322f..8af46628cd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,4 @@ .gitattributes export-ignore .gitignore export-ignore +*.test eol=lf +*.jq eol=lf From 488dc8a4308db36aa396dcf8b44a54bfdff833c8 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Tue, 30 May 2023 17:47:49 -0700 Subject: [PATCH 18/22] Skip workflow_dispatch for windows build --- .github/workflows/windows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2026eb5077..6416a3d067 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,7 +13,6 @@ on: - '**.[chly]' - '**/Makefile.am' - '.github/workflows/windows.yml' - workflow_dispatch: jobs: windows: runs-on: windows-latest @@ -44,7 +43,7 @@ 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 + 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 From 1c28ed6bafc72c1890525486ab52e695b7f617b0 Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Tue, 30 May 2023 17:52:44 -0700 Subject: [PATCH 19/22] Clean up builds --- .github/workflows/linux.yml | 40 ++++++++++++----------------------- .github/workflows/macos.yml | 31 ++++++++++++--------------- .github/workflows/windows.yml | 23 ++++++++++---------- 3 files changed, 40 insertions(+), 54 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index addbe31047..5c21030f10 100644 --- 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 index 1bef23a9f4..6abcddbf74 100644 --- 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 index 6416a3d067..9b65800f2e 100644 --- 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 From 93465d5dbf2fed7c8892c8d4124e22c99d47689c Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Wed, 31 May 2023 08:45:07 -0700 Subject: [PATCH 20/22] Use LF line endings for all text Ref: https://github.com/actions/checkout/issues/135 --- .gitattributes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8af46628cd..366d3c2b3c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,3 @@ .gitattributes export-ignore .gitignore export-ignore -*.test eol=lf -*.jq eol=lf +* text=auto eol=lf From 7681e0e4b961a4469ef7a798a25fc1c93adc684f Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Thu, 1 Jun 2023 09:13:13 -0700 Subject: [PATCH 21/22] Fix test that has rounding error https://github.com/jqlang/jq/pull/2596#issuecomment-1568498993 --- tests/jq.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/jq.test b/tests/jq.test index 2d5c36b887..9aa435a2ea 100644 --- a/tests/jq.test +++ b/tests/jq.test @@ -1565,7 +1565,7 @@ try (1%.) catch . jq: error: Division by zero? at , line 1: # Basic numbers tests: integers, powers of two -[range(-52;52;1)] as $powers | [$powers[]|pow(2;.)|log2] == $powers +[range(-52;52;1)] as $powers | [$powers[]|pow(2;.)|log2|round] == $powers null true From 75f1270a0a7ec83a73a11d245b82c076b5c82bac Mon Sep 17 00:00:00 2001 From: Owen Ou Date: Thu, 1 Jun 2023 09:31:13 -0700 Subject: [PATCH 22/22] Enable CI for all --- .github/workflows/linux.yml | 14 +------------- .github/workflows/macos.yml | 14 +------------- .github/workflows/windows.yml | 17 +---------------- 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5c21030f10..8c38da917f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -2,20 +2,8 @@ name: Linux Build on: push: branches: - - 'master' - paths: - - '!docs/**' - - '!**.md' - - '!appveyor.yml' - - '!.travis.yml' - - '.github/workflows/linux.yml' + - master pull_request: - paths: - - '!docs/**' - - '!**.md' - - '!appveyor.yml' - - '!.travis.yml' - - '.github/workflows/linux.yml' jobs: linux: runs-on: ${{ matrix.os }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6abcddbf74..aa2c1847c0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -2,20 +2,8 @@ name: MacOS Build on: push: branches: - - 'master' - paths: - - '!docs/**' - - '!**.md' - - '!appveyor.yml' - - '!.travis.yml' - - '.github/workflows/macos.yml' + - master pull_request: - paths: - - '!docs/**' - - '!**.md' - - '!appveyor.yml' - - '!.travis.yml' - - '.github/workflows/macos.yml' jobs: macos: runs-on: ${{ matrix.os }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9b65800f2e..04e0c8ecb6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -2,26 +2,11 @@ name: Windows Build on: push: branches: - - 'master' - - 'windows-build' - paths: - - '**.[chly]' - - '**/Makefile.am' - - '.github/workflows/windows.yml' + - master pull_request: - paths: - - '**.[chly]' - - '**/Makefile.am' - - '.github/workflows/windows.yml' jobs: windows: runs-on: windows-latest - env: - APPVER: '10.0' - CODESIGN_PKT: 0000000000000000 - INSTALL_DIR: C:\jq - WINSDKVER: '10.0.22000.0' - WIXDIR: 'c:\Program Files (x86)\Windows Installer XML v3.5' steps: - name: Clone repository uses: actions/checkout@v3