From 7a3d827729751b4321d83bb0b55eba26162b0d31 Mon Sep 17 00:00:00 2001 From: Joshua Sing Date: Tue, 7 Nov 2023 01:02:16 +1100 Subject: [PATCH 1/2] Improve Android CI workflow --- .github/workflows/android.yml | 31 ++++++++++++++++++++++++++++++ .github/workflows/android_test.yml | 30 ----------------------------- 2 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/android.yml delete mode 100644 .github/workflows/android_test.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 0000000000..205a400753 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,31 @@ +# GitHub Actions workflow to run tests on Android. +name: "Android" + +on: [push, pull_request] + +jobs: + test: + name: "Test ${{ matrix.name }}" + runs-on: ubuntu-latest + permissions: + contents: read + strategy: + fail-fast: false + matrix: + include: + - name: "Android 8-9" + min-nal: 26 + max-nal: 28 + - name: "Android 10-11" + min-nal: 29 + max-nal: 30 + steps: + - name: "Checkout repository" + uses: actions/checkout@v4 + + - name: "Run CI script" + run: ./scripts/test + env: + ARCH: "android" + MIN_NAL: "${{ matrix.min-nal }}" + MAX_NAL: "${{ matrix.max-nal }}" diff --git a/.github/workflows/android_test.yml b/.github/workflows/android_test.yml deleted file mode 100644 index ebce7948d2..0000000000 --- a/.github/workflows/android_test.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: android_ci - -on: [push, pull_request] - -jobs: - build-android-8-9: - runs-on: ubuntu-22.04 - continue-on-error: false - env: - ARCH: android - MIN_NAL: 26 - MAX_NAL: 28 - name: Android 8.x 9 - steps: - - uses: actions/checkout@main - - name: Run CI script - run: ./scripts/test - - build-android-10-11: - runs-on: ubuntu-22.04 - continue-on-error: false - env: - ARCH: android - MIN_NAL: 29 - MAX_NAL: 30 - name: Android 10 11 - steps: - - uses: actions/checkout@main - - name: Run CI script - run: ./scripts/test From 557b5a191a3d413d3e3121fb7f1b6c92e9052771 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 7 Nov 2023 14:39:16 +0000 Subject: [PATCH 2/2] cmake: stop passing unused C macros - `-DCPPFLAGS`: probably a copy-paste typo from the initial CMake commit. - `-DNO_CRYPT`: `NO_CRYPT` is no longer used in the source and this macro is no longer set by autotools. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 950a79ee17..541cc11a9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,7 +129,7 @@ if(WIN32) add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS) add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS) - add_definitions(-DCPPFLAGS -DNO_SYSLOG -DNO_CRYPT) + add_definitions(-DNO_SYSLOG) add_definitions(-DWIN32_LEAN_AND_MEAN) if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore") add_definitions(-D_WIN32_WINNT=0x0600)