From 23311b4b68c8ee84162815886ad28fe61b8752fc Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 22:41:19 +0100 Subject: [PATCH 01/16] Start looking at Github CI. --- .github/workflows/ccpp.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/ccpp.yml diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml new file mode 100644 index 00000000..1247fb05 --- /dev/null +++ b/.github/workflows/ccpp.yml @@ -0,0 +1,19 @@ +name: C/C++ CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: configure + run: ./configure + - name: make + run: make + - name: make check + run: make check + - name: make distcheck + run: make distcheck From 05eff0e528a83f83ca0c2ae998e3d0cd4c6f445b Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 22:44:58 +0100 Subject: [PATCH 02/16] Try to build using github CI. --- .github/workflows/ccpp.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 1247fb05..6b897429 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -9,11 +9,8 @@ jobs: steps: - uses: actions/checkout@v1 - - name: configure - run: ./configure + - name: apt + run: apt install libusb-1.0-0-dev libsqlite3-dev - name: make run: make - - name: make check - run: make check - - name: make distcheck - run: make distcheck + From ab42eb23f4e4c4f1578fb5e17ae1f4779c2df8f1 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 22:47:20 +0100 Subject: [PATCH 03/16] Remember to run apt as sudo. --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 6b897429..e64e9bd6 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: apt - run: apt install libusb-1.0-0-dev libsqlite3-dev + run: sudo apt install libusb-1.0-0-dev libsqlite3-dev - name: make run: make From c2c40ccfbb4844b2c662c172ea3e276c3135d0b1 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 22:48:48 +0100 Subject: [PATCH 04/16] Also remember to install ninja-build. --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index e64e9bd6..fcf64864 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: apt - run: sudo apt install libusb-1.0-0-dev libsqlite3-dev + run: sudo apt install libusb-1.0-0-dev libsqlite3-dev ninja-build - name: make run: make From 39599b76c81103111b8ce29743ed5518b9eeefd3 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 22:52:30 +0100 Subject: [PATCH 05/16] Stop building the Ubuntu version with Travis. --- .travis.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 488a29f0..18d4afbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,6 @@ git: matrix: include: - - - os: linux - sudo: false - dist: xenial - compiler: gcc - env: CXX=g++-8 - script: - - make - os: osx osx_image: xcode10.2 @@ -20,15 +12,6 @@ matrix: - HOMEBREW_NO_INSTALL_CLEANUP=1 addons: - apt: - sources: - - llvm-toolchain-precise-3.8 - - ubuntu-toolchain-r-test - packages: - - ninja-build - - libusb-1.0-0-dev - - libsqlite3-dev - - g++-8 homebrew: packages: - ninja From 2d4d56d09feb905829b3a32d45eb6e44819a212e Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 22:55:37 +0100 Subject: [PATCH 06/16] Try Github CI for OSX builds instead of Travis. --- .github/workflows/ccpp.yml | 13 ++++++++++--- .travis.yml | 22 ---------------------- 2 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index fcf64864..2b2b31d9 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -3,10 +3,8 @@ name: C/C++ CI on: [push] jobs: - build: - +- build: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v1 - name: apt @@ -14,3 +12,12 @@ jobs: - name: make run: make +- build: + runs-on: macos-latest + steps: + - uses: actions/checkout@v1 + - name: brew + run: brew install sqlite + - name: make + run: make + diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 18d4afbe..00000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: shell -git: - depth: 1 - -matrix: - include: - - - os: osx - osx_image: xcode10.2 - compiler: clang - env: - - HOMEBREW_NO_INSTALL_CLEANUP=1 - -addons: - homebrew: - packages: - - ninja - -script: -- make - - From f8b8bc22950a740b6beb2d167f4cc9d55b6174dd Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 22:57:29 +0100 Subject: [PATCH 07/16] Fiddle with YAML syntax. --- .github/workflows/ccpp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 2b2b31d9..92e556e6 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1,9 +1,9 @@ name: C/C++ CI -on: [push] +on: [push, pull_request] jobs: -- build: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -12,7 +12,7 @@ jobs: - name: make run: make -- build: + build: runs-on: macos-latest steps: - uses: actions/checkout@v1 From 20b1b2a4a8bdc499088cfeddef2204f3d5b45e74 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 22:58:28 +0100 Subject: [PATCH 08/16] More YAML syntax fiddling? --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 92e556e6..1dafa8f0 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -3,7 +3,7 @@ name: C/C++ CI on: [push, pull_request] jobs: - build: + build-linux: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -12,7 +12,7 @@ jobs: - name: make run: make - build: + build-macos: runs-on: macos-latest steps: - uses: actions/checkout@v1 From f7fb2a844b02868bde3deb846d1f4e67496db758 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 23:00:10 +0100 Subject: [PATCH 09/16] Github's OSX doesn't install pkg-config by default? --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 1dafa8f0..13eee6a2 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: brew - run: brew install sqlite + run: brew install sqlite pkg-config - name: make run: make From 5dd5c8516abe68452fa12f88c02c88aea04ca745 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 23:01:08 +0100 Subject: [PATCH 10/16] Don't do builds on push_request, because these always coincide with pushes. --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 13eee6a2..649b3d54 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1,6 +1,6 @@ name: C/C++ CI -on: [push, pull_request] +on: [push] jobs: build-linux: From 7200de97021078679772077e81152fba85a62195 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 23:02:13 +0100 Subject: [PATCH 11/16] Add more Homebrew packages. --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 649b3d54..e5a55474 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: brew - run: brew install sqlite pkg-config + run: brew install sqlite pkg-config libusb ninja - name: make run: make From 1210549f59ac730cf55a6000bfaca6dba63b5651 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 23:12:29 +0100 Subject: [PATCH 12/16] Try Windows builds on github. --- .github/workflows/ccpp.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index e5a55474..8c4bd38f 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -21,3 +21,15 @@ jobs: - name: make run: make + build-windows: + runs-on: windows-latest + steps: + - uses: numworks/setup-msys2@v1 + with: + msystem: MSYS + - name: pacman + run: msys2do pacman -S --noconfirm --needed make ninja mingw-w64-i686-libusb mingw-w64-i686-sqlite3 mingw-w64-i686-zlib mingw-w64-i686-gcc zip + - name: make + run: | + set MSYSTEM=MINGW32 + msys2do make From effaeff51e8fd9f92ad6e239c274b411593d1b85 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 23:19:48 +0100 Subject: [PATCH 13/16] Something's not right --- test. --- .github/workflows/ccpp.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 8c4bd38f..9ef48e54 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -29,6 +29,14 @@ jobs: msystem: MSYS - name: pacman run: msys2do pacman -S --noconfirm --needed make ninja mingw-w64-i686-libusb mingw-w64-i686-sqlite3 mingw-w64-i686-zlib mingw-w64-i686-gcc zip + - name: pwd + run: | + set MSYSTEM=MINGW32 + msys2do pwd + - name: ls + run: | + set MSYSTEM=MINGW32 + msys2do ls - name: make run: | set MSYSTEM=MINGW32 From 2f1a5189d67f49f6c78acb9a1124d461d4a42919 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 23:21:58 +0100 Subject: [PATCH 14/16] Oh, yeah, let's actually check out our project! --- .github/workflows/ccpp.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 9ef48e54..8fe6dca6 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -27,16 +27,9 @@ jobs: - uses: numworks/setup-msys2@v1 with: msystem: MSYS + - uses: actions/checkout@v1 - name: pacman run: msys2do pacman -S --noconfirm --needed make ninja mingw-w64-i686-libusb mingw-w64-i686-sqlite3 mingw-w64-i686-zlib mingw-w64-i686-gcc zip - - name: pwd - run: | - set MSYSTEM=MINGW32 - msys2do pwd - - name: ls - run: | - set MSYSTEM=MINGW32 - msys2do ls - name: make run: | set MSYSTEM=MINGW32 From 4488b2542f69ddc732b9f23acc3705cce728d1ca Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 23:24:23 +0100 Subject: [PATCH 15/16] Update MSYS build environment. --- .github/workflows/ccpp.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 8fe6dca6..6544e6b2 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -31,6 +31,4 @@ jobs: - name: pacman run: msys2do pacman -S --noconfirm --needed make ninja mingw-w64-i686-libusb mingw-w64-i686-sqlite3 mingw-w64-i686-zlib mingw-w64-i686-gcc zip - name: make - run: | - set MSYSTEM=MINGW32 - msys2do make + run: msys2do make From c264fec6e9a786505d6082e9ec7a3980564a96c5 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 13 Dec 2019 23:38:49 +0100 Subject: [PATCH 16/16] The Windows stuff doesn't work, so let's shelve it for now. --- .github/workflows/ccpp.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 6544e6b2..76dc1519 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -21,14 +21,14 @@ jobs: - name: make run: make - build-windows: - runs-on: windows-latest - steps: - - uses: numworks/setup-msys2@v1 - with: - msystem: MSYS - - uses: actions/checkout@v1 - - name: pacman - run: msys2do pacman -S --noconfirm --needed make ninja mingw-w64-i686-libusb mingw-w64-i686-sqlite3 mingw-w64-i686-zlib mingw-w64-i686-gcc zip - - name: make - run: msys2do make +# build-windows: +# runs-on: windows-latest +# steps: +# - uses: numworks/setup-msys2@v1 +# with: +# msystem: MSYS +# - uses: actions/checkout@v1 +# - name: pacman +# run: msys2do pacman -S --noconfirm --needed make ninja mingw-w64-i686-libusb mingw-w64-i686-sqlite3 mingw-w64-i686-zlib mingw-w64-i686-gcc zip +# - name: make +# run: msys2do make