From c6cbc1c4a02cac236b4822b5fec4b24740da5b41 Mon Sep 17 00:00:00 2001 From: firewave Date: Mon, 30 Sep 2024 13:27:32 +0200 Subject: [PATCH 1/2] updated CI to `macos-13` --- .github/workflows/CI-unixish.yml | 12 ++++++------ .github/workflows/scriptcheck.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index fb2e037431f..be7b227333c 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12] + os: [ubuntu-20.04, ubuntu-22.04, macos-13] include: - use_qt6: On - os: ubuntu-20.04 @@ -83,7 +83,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12] + os: [ubuntu-20.04, ubuntu-22.04, macos-13] include: - use_qt6: On - os: ubuntu-20.04 @@ -165,7 +165,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12] + os: [ubuntu-20.04, ubuntu-22.04, macos-13] fail-fast: false # Prefer quick result runs-on: ${{ matrix.os }} @@ -197,7 +197,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12] + os: [ubuntu-20.04, ubuntu-22.04, macos-13] fail-fast: false # Prefer quick result runs-on: ${{ matrix.os }} @@ -229,7 +229,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12] + os: [ubuntu-20.04, ubuntu-22.04, macos-13] fail-fast: false # Prefer quick result runs-on: ${{ matrix.os }} @@ -339,7 +339,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12] + os: [ubuntu-20.04, ubuntu-22.04, macos-13] fail-fast: false # Prefer quick result runs-on: ${{ matrix.os }} diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml index 189fe01527a..7b7eff9d26c 100644 --- a/.github/workflows/scriptcheck.yml +++ b/.github/workflows/scriptcheck.yml @@ -185,7 +185,7 @@ jobs: dmake: strategy: matrix: - os: [ubuntu-22.04, macos-12, windows-2022] + os: [ubuntu-22.04, macos-13, windows-2022] fail-fast: false runs-on: ${{ matrix.os }} From 69d56b551a3a0dfd60a4f5985a356bc436794333 Mon Sep 17 00:00:00 2001 From: firewave Date: Mon, 30 Sep 2024 13:11:49 +0200 Subject: [PATCH 2/2] test/cli/runtests.sh: disabled `-Wimplicit-function-declaration` to avoid warnings on `macos-13` for now --- test/cfg/runtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh index 3f2524c0e11..1ff731abe16 100755 --- a/test/cfg/runtests.sh +++ b/test/cfg/runtests.sh @@ -44,7 +44,7 @@ CPPCHECK_OPT=( CXX=g++ CXX_OPT=("-fsyntax-only" "-w" "-std=c++2a") CC=gcc -CC_OPT=("-fsyntax-only" "-w" "-Wimplicit-function-declaration" "-std=c11") +CC_OPT=("-fsyntax-only" "-w" "-Wno-implicit-function-declaration" "-std=c11") # TODO: remove -Wno-implicit-function-declaration when warnings are fixed on MacOS function get_pkg_config_cflags { # TODO: get rid of the error enabling/disabling?