Skip to content

Commit

Permalink
Migrate Windows CI to GitHub Actions.
Browse files Browse the repository at this point in the history
  • Loading branch information
SiarheiFedartsou committed Aug 19, 2022
1 parent 4635664 commit 9bd035b
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/osrm-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down
15 changes: 15 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 1 addition & 9 deletions scripts/ci/windows-build.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@REM @ECHO OFF
@ECHO OFF
SETLOCAL
SET EL=0

Expand All @@ -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
Expand Down

0 comments on commit 9bd035b

Please sign in to comment.