From 2b972f58442279c61c1fe26d06a6e89fb3b6d9b6 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 12:43:33 +0200 Subject: [PATCH] wip --- .github/workflows/osrm-backend.yml | 42 ++++++------ scripts/ci/windows-build.bat | 100 ++++++++++++++--------------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index e79f55226..4c173fa2d 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -57,27 +57,27 @@ jobs: - name: Build run: | .\scripts\ci\windows-build.bat - - name: Run node tests - shell: bash - run: | - ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm - node test/nodejs/index.js - - name: Build Node package - shell: bash - run: ./scripts/ci/node_package.sh - - name: Publish Node package - if: ${{ env.PUBLISH == 'On' }} - uses: ncipollo/release-action@v1 - with: - allowUpdates: true - artifactErrorsFailBuild: true - artifacts: build/stage/**/*.tar.gz - omitBody: true - omitBodyDuringUpdate: true - omitName: true - omitNameDuringUpdate: true - replacesArtifacts: true - token: ${{ secrets.GITHUB_TOKEN }} + # - name: Run node tests + # shell: bash + # run: | + # ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm + # node test/nodejs/index.js + # - name: Build Node package + # shell: bash + # run: ./scripts/ci/node_package.sh + # - name: Publish Node package + # if: ${{ env.PUBLISH == 'On' }} + # uses: ncipollo/release-action@v1 + # with: + # allowUpdates: true + # artifactErrorsFailBuild: true + # artifacts: build/stage/**/*.tar.gz + # omitBody: true + # omitBodyDuringUpdate: true + # omitName: true + # omitNameDuringUpdate: true + # replacesArtifacts: true + # token: ${{ secrets.GITHUB_TOKEN }} format-taginfo-docs: runs-on: ubuntu-22.04 diff --git a/scripts/ci/windows-build.bat b/scripts/ci/windows-build.bat index c09a041fa..4eaaa0c50 100644 --- a/scripts/ci/windows-build.bat +++ b/scripts/ci/windows-build.bat @@ -29,65 +29,65 @@ msbuild OSRM.sln ^ /nologo IF %ERRORLEVEL% NEQ 0 GOTO ERROR -CD %PROJECT_DIR%\build -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM CD %PROJECT_DIR%\build +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -ECHO running extractor-tests.exe ... -unit_tests\%CONFIGURATION%\extractor-tests.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM ECHO running extractor-tests.exe ... +@REM unit_tests\%CONFIGURATION%\extractor-tests.exe +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -ECHO running contractor-tests.exe ... -unit_tests\%CONFIGURATION%\contractor-tests.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM ECHO running contractor-tests.exe ... +@REM unit_tests\%CONFIGURATION%\contractor-tests.exe +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -ECHO running engine-tests.exe ... -unit_tests\%CONFIGURATION%\engine-tests.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM ECHO running engine-tests.exe ... +@REM unit_tests\%CONFIGURATION%\engine-tests.exe +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -ECHO running util-tests.exe ... -unit_tests\%CONFIGURATION%\util-tests.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM ECHO running util-tests.exe ... +@REM unit_tests\%CONFIGURATION%\util-tests.exe +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -ECHO running server-tests.exe ... -unit_tests\%CONFIGURATION%\server-tests.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM ECHO running server-tests.exe ... +@REM unit_tests\%CONFIGURATION%\server-tests.exe +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -ECHO running partitioner-tests.exe ... -unit_tests\%CONFIGURATION%\partitioner-tests.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM ECHO running partitioner-tests.exe ... +@REM unit_tests\%CONFIGURATION%\partitioner-tests.exe +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -ECHO running customizer-tests.exe ... -unit_tests\%CONFIGURATION%\customizer-tests.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM ECHO running customizer-tests.exe ... +@REM unit_tests\%CONFIGURATION%\customizer-tests.exe +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -SET test_region=monaco -SET test_region_ch=ch\monaco -SET test_region_mld=mld\monaco -SET test_osm=%test_region%.osm.pbf -COPY %PROJECT_DIR%\test\data\%test_region%.osm.pbf %test_osm% -%CONFIGURATION%\osrm-extract.exe -p %PROJECT_DIR%\profiles\car.lua %test_osm% -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM SET test_region=monaco +@REM SET test_region_ch=ch\monaco +@REM SET test_region_mld=mld\monaco +@REM SET test_osm=%test_region%.osm.pbf +@REM COPY %PROJECT_DIR%\test\data\%test_region%.osm.pbf %test_osm% +@REM %CONFIGURATION%\osrm-extract.exe -p %PROJECT_DIR%\profiles\car.lua %test_osm% +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -MKDIR ch -XCOPY %test_region%.osrm.* ch\ -XCOPY %test_region%.osrm ch\ -MKDIR mld -XCOPY %test_region%.osrm.* mld\ -XCOPY %test_region%.osrm mld\ -%CONFIGURATION%\osrm-contract.exe %test_region_ch%.osrm -%CONFIGURATION%\osrm-partition.exe %test_region_mld%.osrm -%CONFIGURATION%\osrm-customize.exe %test_region_mld%.osrm -XCOPY /Y ch\*.* ..\test\data\ch\ -XCOPY /Y mld\*.* ..\test\data\mld\ -unit_tests\%CONFIGURATION%\library-tests.exe -IF %ERRORLEVEL% NEQ 0 GOTO ERROR +@REM MKDIR ch +@REM XCOPY %test_region%.osrm.* ch\ +@REM XCOPY %test_region%.osrm ch\ +@REM MKDIR mld +@REM XCOPY %test_region%.osrm.* mld\ +@REM XCOPY %test_region%.osrm mld\ +@REM %CONFIGURATION%\osrm-contract.exe %test_region_ch%.osrm +@REM %CONFIGURATION%\osrm-partition.exe %test_region_mld%.osrm +@REM %CONFIGURATION%\osrm-customize.exe %test_region_mld%.osrm +@REM XCOPY /Y ch\*.* ..\test\data\ch\ +@REM XCOPY /Y mld\*.* ..\test\data\mld\ +@REM unit_tests\%CONFIGURATION%\library-tests.exe +@REM IF %ERRORLEVEL% NEQ 0 GOTO ERROR -:ERROR -ECHO ~~~~~~~~~~~~~~~~~~~~~~ ERROR %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -ECHO ERRORLEVEL^: %ERRORLEVEL% -SET EL=%ERRORLEVEL% +@REM :ERROR +@REM ECHO ~~~~~~~~~~~~~~~~~~~~~~ ERROR %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@REM ECHO ERRORLEVEL^: %ERRORLEVEL% +@REM SET EL=%ERRORLEVEL% -:DONE -ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@REM :DONE +@REM ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -EXIT /b %EL% +@REM EXIT /b %EL%