From 4ab610fcb8b772a8e4e8f7fb6a0cc2854981faf1 Mon Sep 17 00:00:00 2001 From: drodin Date: Fri, 30 Jul 2021 09:54:17 +0200 Subject: [PATCH 1/2] update ci toolchains --- .github/workflows/ci/matrix.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci/matrix.json b/.github/workflows/ci/matrix.json index 7541b2ab9d..c487954479 100644 --- a/.github/workflows/ci/matrix.json +++ b/.github/workflows/ci/matrix.json @@ -1,13 +1,13 @@ [ -{ "example": "foo", "toolchain": "clang-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "gcc-7-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "gcc-8-cxx17-fpic", "os": "ubuntu-18.04", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "clang-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "gcc-7-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "gcc-8-cxx17-fpic", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, { "example": "foo", "toolchain": "gcc-9-cxx17-fpic", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "android-ndk-r17-api-24-arm64-v8a-clang-libcxx14", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "analyze-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "sanitize-address-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "sanitize-leak-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "sanitize-thread-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "android-ndk-r17-api-24-arm64-v8a-clang-libcxx14", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "analyze-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "sanitize-address-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "sanitize-leak-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "sanitize-thread-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, { "example": "foo", "toolchain": "osx-10-13-make-cxx14", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, { "example": "foo", "toolchain": "osx-10-13-cxx14", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, { "example": "foo", "toolchain": "osx-10-15-dep-10-10-cxx17", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, From 90930be90fb65f9994ad2b1beacfa0a5c4186e79 Mon Sep 17 00:00:00 2001 From: drodin Date: Fri, 30 Jul 2021 20:26:07 +0200 Subject: [PATCH 2/2] update osx/ios ci toolchains --- .github/workflows/ci/matrix.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci/matrix.json b/.github/workflows/ci/matrix.json index c487954479..f86337dbd0 100644 --- a/.github/workflows/ci/matrix.json +++ b/.github/workflows/ci/matrix.json @@ -8,11 +8,9 @@ { "example": "foo", "toolchain": "sanitize-address-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, { "example": "foo", "toolchain": "sanitize-leak-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, { "example": "foo", "toolchain": "sanitize-thread-cxx17", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "osx-10-13-make-cxx14", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "osx-10-13-cxx14", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "osx-10-15-dep-10-10-cxx17", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "osx-11-0-arch-universal2", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, -{ "example": "foo", "toolchain": "ios-nocodesign-13-2-dep-9-3", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "osx-10-15-make-cxx14", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "osx-11-1-arch-universal2-cxx17", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, +{ "example": "foo", "toolchain": "ios-nocodesign-14-4-dep-10-0-arm64", "os": "macos-10.15", "python": "3.8", "script": "build.sh" }, { "example": "foo", "toolchain": "ninja-vs-15-2017-win64-cxx17", "os": "windows-2016", "python": "3.8", "script": "build.cmd" }, { "example": "foo", "toolchain": "nmake-vs-15-2017-win64-cxx17", "os": "windows-2016", "python": "3.8", "script": "build.cmd" }, { "example": "foo", "toolchain": "vs-16-2019-win64-sdk-10-0-18362-0-cxx17", "os": "windows-2019", "python": "3.8", "script": "build.cmd" },