From 9bd035b81cdd4ecb3343ac8e4180f391adfa0eca Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 19 Aug 2022 16:37:11 +0200 Subject: [PATCH] Migrate Windows CI to GitHub Actions. --- .github/workflows/osrm-backend.yml | 2 +- CHANGELOG.md | 1 + CMakeLists.txt | 6 +++++- appveyor.yml | 15 +++++++++++++++ scripts/ci/windows-build.bat | 10 +--------- 5 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 appveyor.yml diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 909fc5eda51..9ab5780654a 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -663,6 +663,6 @@ jobs: ci-complete: runs-on: ubuntu-18.04 - needs: build-test-publish + needs: [build-test-publish, docker-image, windows] steps: - run: echo "CI complete" diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a2b8508aa2..0a639194e61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - FIXED: Fix bug with reading Set values from Lua scripts. [#6285](https://github.com/Project-OSRM/osrm-backend/pull/6285) - FIXED: Bug in bicycle profile that caused exceptions if there is a highway=bicycle in the data. [#6296](https://github.com/Project-OSRM/osrm-backend/pull/6296) - Build: + - CHANGED: Migrate Windows CI to GitHub Actions. [#6312](https://github.com/Project-OSRM/osrm-backend/pull/6312) - ADDED: Add smoke test for Docker image. [#6313](https://github.com/Project-OSRM/osrm-backend/pull/6313) - CHANGED: Update libosmium to version 2.18.0. [#6303](https://github.com/Project-OSRM/osrm-backend/pull/6303) - CHANGED: Remove EXACT from find_package if using Conan. [#6299](https://github.com/Project-OSRM/osrm-backend/pull/6299) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7f9f22589a..5bf19bbaca6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -445,8 +445,9 @@ add_subdirectory(${FLATBUFFERS_SRC_DIR} ${CMAKE_CURRENT_BINARY_DIR}/flatbuffers-build EXCLUDE_FROM_ALL) +# see https://stackoverflow.com/questions/70898030/boost-link-error-using-conan-find-package if (MSVC) -add_definitions(-DBOOST_ALL_NO_LIB) + add_definitions(-DBOOST_ALL_NO_LIB) endif() if(ENABLE_CONAN) @@ -466,6 +467,9 @@ if(ENABLE_CONAN) set(CONAN_SYSTEM_INCLUDES ON) + # TODO: + # if we link TBB dynamically osrm-extract.exe finishes on the first access to any TBB symbol + # with exit code = -1073741515, which means that program cannot load required DLL. if (MSVC) set(TBB_SHARED False) else() diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000000..a1849a9e7e2 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,15 @@ +os: Visual Studio 2019 + +# clone directory +clone_folder: c:\projects\osrm + +platform: x64 + +# no-op for the time being until someone with access to GitHub checks settings will remove integration with AppVeyor +# https://github.com/Project-OSRM/osrm-backend/pull/6312#issuecomment-1217237055 +build_script: + - EXIT 0 + +branches: + only: + - master diff --git a/scripts/ci/windows-build.bat b/scripts/ci/windows-build.bat index d760edbd8d5..19eb8c7b48b 100644 --- a/scripts/ci/windows-build.bat +++ b/scripts/ci/windows-build.bat @@ -1,4 +1,4 @@ -@REM @ECHO OFF +@ECHO OFF SETLOCAL SET EL=0 @@ -7,14 +7,6 @@ ECHO NUMBER_OF_PROCESSORS^: %NUMBER_OF_PROCESSORS% SET PROJECT_DIR=%CD% SET CONFIGURATION=Release -@REM SET PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH% -@REM CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" -@REM CALL "C:\Program Files\Microsoft Visual Studio\Installer\vswhere.exe" -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe -@REM ECHO cl.exe version -@REM cl -@REM ECHO msbuild version -@REM msbuild /version - mkdir build IF %ERRORLEVEL% NEQ 0 GOTO ERROR cd build