From 30a44345b45d6718777529f722b3789c3a8a0cf4 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Fri, 1 Dec 2023 11:25:09 +0100 Subject: [PATCH] CI: Add Linux and MSYS build with logging disabled Closes #1357 Signed-off-by: Tormod Volden --- .github/workflows/linux.yml | 3 +++ .github/workflows/msys2.yml | 13 +++++++------ libusb/version_nano.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c7b57dbb..cae0184a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -35,6 +35,9 @@ jobs: - name: debug-log run: .private/ci-build.sh --build-dir build-debug -- --enable-debug-log + - name: disable-log + run: .private/ci-build.sh --build-dir build-nolog -- --disable-log + - uses: mymindstorm/setup-emsdk@v13 - run: npm ci diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 352fc27f..dc7f114b 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -14,9 +14,10 @@ jobs: msystem: MINGW64 update: true install: git mingw-w64-x86_64-cc mingw-w64-x86_64-autotools - - name: CI-Build - run: | - echo 'Running in MSYS2!' - ./bootstrap.sh - # GCC on MSYS2 doesn't have ASAN support (but Clang does). - ./.private/ci-build.sh --build-dir build-msys2 --no-asan + - name: bootstrap + run: ./bootstrap.sh + - name: Build + # GCC on MSYS2 doesn't have ASAN support (but Clang does). + run: ./.private/ci-build.sh --build-dir build-msys2 --no-asan + - name: Build with logging disabled + run: ./.private/ci-build.sh --build-dir build-msys2-nolog --no-asan -- --disable-log diff --git a/libusb/version_nano.h b/libusb/version_nano.h index fdae9621..6ae12b3f 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11834 +#define LIBUSB_NANO 11835