From 675916cb98129ed5867fa1c74107da44bddc22e5 Mon Sep 17 00:00:00 2001 From: Dirk Vanden Boer Date: Tue, 23 Apr 2024 20:33:27 +0200 Subject: [PATCH] Restore osx build --- .github/workflows/vcpkg-build.yml | 13 ++++- CMakePresets.json | 50 ++++++++--------- CMakeSettings.json | 90 ------------------------------- deps/infra | 2 +- deps/vcpkg | 2 +- 5 files changed, 40 insertions(+), 117 deletions(-) delete mode 100644 CMakeSettings.json diff --git a/.github/workflows/vcpkg-build.yml b/.github/workflows/vcpkg-build.yml index 6695e32..35e1332 100644 --- a/.github/workflows/vcpkg-build.yml +++ b/.github/workflows/vcpkg-build.yml @@ -12,7 +12,7 @@ jobs: cfg: - { os: ubuntu-latest, triplet: x64-linux } - { os: windows-2022, triplet: x64-windows-static-vs2022 } - #- { os: macos-latest, triplet: x64-osx-10_15 } + - { os: macos-latest, triplet: x64-osx } steps: - uses: actions/setup-python@v5 @@ -42,3 +42,14 @@ jobs: run: ./deps/vcpkg/vcpkg fetch ninja - name: Build the code run: python build.py --triplet ${{ matrix.cfg.triplet }} --run-tests --dist + - name: Archive build logs + if: ${{ failure() }} + uses: actions/upload-artifact@v4 + with: + name: build-logs + path: | + deps/vcpkg/buildtrees/**/config*.log + deps/vcpkg/buildtrees/**/build*.log + deps/vcpkg/buildtrees/**/install*.log + deps/vcpkg/buildtrees/**/package*.log + diff --git a/CMakePresets.json b/CMakePresets.json index 145b408..df50bec 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -12,11 +12,11 @@ "generator": "Ninja", "binaryDir": "${sourceDir}/build/vcpkg", "cacheVariables": { - "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/deps/vcpkg/scripts/buildsystems/vcpkg.cmake", - "VCPKG_APPLOCAL_DEPS": "OFF", - "VCPKG_INSTALLED_DIR": "${sourceDir}/vcpkg_installed", - "BUILD_TESTING": "ON", - "VCPKG_MANIFEST_MODE": "OFF" + "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/deps/vcpkg/scripts/buildsystems/vcpkg.cmake", + "VCPKG_APPLOCAL_DEPS": "OFF", + "VCPKG_INSTALLED_DIR": "${sourceDir}/vcpkg_installed", + "BUILD_TESTING": "ON", + "VCPKG_MANIFEST_MODE": "OFF" }, "environment": { "VCPKG_OVERLAY_PORTS": "${sourceDir}/deps/overlay-ports" @@ -46,26 +46,26 @@ } }, { - "name": "x64-windows-static-vs2022 debug", - "inherits": "windows-base", - "displayName": "Windows x64 Debug", - "description": "Vcpkg debug build for x64 on windows", - "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "x64-windows-static-vs2022", - "VCPKG_DEFAULT_HOST_TRIPLET": "x64-windows-static-vs2022", - "CMAKE_BUILD_TYPE": "Debug" - } + "name": "x64-windows-static-vs2022 debug", + "inherits": "windows-base", + "displayName": "Windows x64 Debug", + "description": "Vcpkg debug build for x64 on windows", + "cacheVariables": { + "VCPKG_TARGET_TRIPLET": "x64-windows-static-vs2022", + "VCPKG_DEFAULT_HOST_TRIPLET": "x64-windows-static-vs2022", + "CMAKE_BUILD_TYPE": "Debug" + } }, { - "name": "x64-windows-static-vs2022 release", - "inherits": "windows-base", - "displayName": "Windows x64 Release", - "description": "Vcpkg release build for x64 on windows", - "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "x64-windows-static-vs2022", - "VCPKG_DEFAULT_HOST_TRIPLET": "x64-windows-static-vs2022", - "CMAKE_BUILD_TYPE": "Release" - } + "name": "x64-windows-static-vs2022 release", + "inherits": "windows-base", + "displayName": "Windows x64 Release", + "description": "Vcpkg release build for x64 on windows", + "cacheVariables": { + "VCPKG_TARGET_TRIPLET": "x64-windows-static-vs2022", + "VCPKG_DEFAULT_HOST_TRIPLET": "x64-windows-static-vs2022", + "CMAKE_BUILD_TYPE": "Release" + } }, { "name": "arm64-osx", @@ -75,7 +75,9 @@ "cacheVariables": { "VCPKG_TARGET_TRIPLET": "arm64-osx", "CMAKE_OSX_ARCHITECTURES": "arm64", - "CMAKE_BUILD_TYPE": "Release" + "CMAKE_BUILD_TYPE": "Release", + "VCPKG_INSTALLED_DIR": "${sourceDir}/vcpkgs-arm64-osx", + "VCPKG_ALLOW_SYSTEM_LIBS": "ON" } }, { diff --git a/CMakeSettings.json b/CMakeSettings.json deleted file mode 100644 index c017812..0000000 --- a/CMakeSettings.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "environments": [ - { - "generator": "Ninja", - "buildRoot": "${workspaceRoot}/../builds/emap", - "cmakeToolchain": "${workspaceRoot}/deps/vcpkg/scripts/buildsystems/vcpkg.cmake", - "cmakeCommandArgs": "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${workspaceRoot}/deps/vcpkg/scripts/toolchains/windows.cmake -C ${workspaceRoot}/deps/vcpkg/triplets/x64-windows-static-vs2019.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static-vs2019 -DVCPKG_APPLOCAL_DEPS=OFF -DBUILD_TESTING=ON" - } - ], - "configurations": [ - { - "name": "E-MAP [DBG]", - "generator": "Ninja", - "inheritEnvironments": [ - "msvc_x64_x64" - ], - "configurationType": "Debug", - "buildRoot": "${env.buildRoot}/${name}", - "cmakeToolchain": "${env.cmakeToolchain}", - "cmakeCommandArgs": "${env.cmakeCommandArgs}", - "variables": [] - }, - { - "name": "E-MAP [REL]", - "generator": "Ninja", - "inheritEnvironments": [ - "msvc_x64_x64" - ], - "configurationType": "Release", - "buildRoot": "${env.buildRoot}/${name}", - "cmakeToolchain": "${env.cmakeToolchain}", - "cmakeCommandArgs": "${env.cmakeCommandArgs}", - "variables": [] - }, - { - "name": "E-MAP [RELDEB]", - "generator": "Ninja", - "inheritEnvironments": [ - "msvc_x64_x64" - ], - "configurationType": "RelWithDebInfo", - "buildRoot": "${env.buildRoot}/${name}", - "cmakeToolchain": "${env.cmakeToolchain}", - "cmakeCommandArgs": "${env.cmakeCommandArgs}", - "variables": [] - }, - { - "name": "E-MAP [DBG][Clang]", - "generator": "Ninja", - "configurationType": "Debug", - "buildRoot": "${env.buildRoot}/${name}", - "cmakeToolchain": "${env.cmakeToolchain}", - "cmakeCommandArgs": "${env.cmakeCommandArgs}", - "variables": [ - { - "name": "VCPKG_CLANG", - "value": "ON", - "type": "BOOL" - }, - { - "name": "VCPKG_CLANG_PATH", - "value": "${workspaceRoot}/../builds/downloads/tools/clang++/bin", - "type": "PATH" - } - ], - "inheritEnvironments": [] - }, - { - "name": "E-MAP [REL][Clang]", - "generator": "Ninja", - "configurationType": "Release", - "buildRoot": "${env.buildRoot}/${name}", - "cmakeToolchain": "${env.cmakeToolchain}", - "cmakeCommandArgs": "${env.cmakeCommandArgs}", - "variables": [ - { - "name": "VCPKG_CLANG", - "value": "ON", - "type": "BOOL" - }, - { - "name": "VCPKG_CLANG_PATH", - "value": "${workspaceRoot}/../builds/downloads/tools/clang++/bin", - "type": "PATH" - } - ], - "inheritEnvironments": [] - } - ] -} \ No newline at end of file diff --git a/deps/infra b/deps/infra index affb2a8..13e0680 160000 --- a/deps/infra +++ b/deps/infra @@ -1 +1 @@ -Subproject commit affb2a88419563c84d65b820c01466bca4594916 +Subproject commit 13e068061d8c2740ef01a97a60afe0c4f2f77dcb diff --git a/deps/vcpkg b/deps/vcpkg index 31d7b67..6094549 160000 --- a/deps/vcpkg +++ b/deps/vcpkg @@ -1 +1 @@ -Subproject commit 31d7b67d01817e7c6f3bacc8f5470d02081c7635 +Subproject commit 609454949571751789e203dddc583cf31b163ff0