From 2c16318c29d3027bdd7a34834340214be5f2d274 Mon Sep 17 00:00:00 2001
From: Siarhei Fedartsou <siarhei.fedartsou@gmail.com>
Date: Thu, 8 Sep 2022 17:24:24 +0200
Subject: [PATCH] wip

---
 .github/workflows/osrm-backend.yml | 39 ++++++++++++++++++++----------
 scripts/ci/node_package.sh         |  8 +++---
 scripts/ci/windows-build.bat       |  6 +----
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml
index c6a7a6769..cc7189e09 100644
--- a/.github/workflows/osrm-backend.yml
+++ b/.github/workflows/osrm-backend.yml
@@ -50,6 +50,19 @@ jobs:
         npm run nodejs-tests
     - name: Build Node package
       run: ./scripts/ci/node_package.sh
+    - name: Publish Node package
+      if: ${{ matrix.build_node_package && 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-20.04
@@ -663,19 +676,19 @@ jobs:
     # - name: Build Node package
     #   if: ${{ matrix.build_node_package && env.PUBLISH == 'On' }}
     #   run: ./scripts/ci/node_package.sh
-  #   - name: Publish Node package
-  #     if: ${{ matrix.build_node_package && 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: Publish Node package
+    #   if: ${{ matrix.build_node_package && 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 }}
 
   # ci-complete:
   #   runs-on: ubuntu-22.04
diff --git a/scripts/ci/node_package.sh b/scripts/ci/node_package.sh
index fd62c8adb..d2728e287 100755
--- a/scripts/ci/node_package.sh
+++ b/scripts/ci/node_package.sh
@@ -7,7 +7,7 @@ echo "node version is:"
 which node
 node -v
 
-if [[ ${PUBLISH} == 'On' ]]; then
+#if [[ ${PUBLISH} == 'On' ]]; then
     echo "PUBLISH is set to '${PUBLISH}', publishing!"
     NPM_FLAGS=''
     if [[ ${BUILD_TYPE} == "Debug" ]]; then
@@ -32,6 +32,6 @@ if [[ ${PUBLISH} == 'On' ]]; then
     fi
 
     ./node_modules/.bin/node-pre-gyp package testpackage $NPM_FLAGS
-else
-    echo "PUBLISH is set to '${PUBLISH}', skipping."
-fi
+# else
+#     echo "PUBLISH is set to '${PUBLISH}', skipping."
+# fi
diff --git a/scripts/ci/windows-build.bat b/scripts/ci/windows-build.bat
index 8179a2df1..714f19387 100644
--- a/scripts/ci/windows-build.bat
+++ b/scripts/ci/windows-build.bat
@@ -11,7 +11,7 @@ mkdir build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 cd build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-cmake -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBUILD_TOOLS=ON -G "Visual Studio 17 2022" ..
+cmake -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "Visual Studio 17 2022" ..
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 msbuild OSRM.sln ^
@@ -25,10 +25,6 @@ msbuild OSRM.sln ^
 /nologo
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-dir C:\Users\runneradmin\.conan\
-dir C:\Users\runneradmin\.conan\data\tbb\2020.3\_\_\package\e9a552ebe8f994398de9ceee972f0ad207df0658\lib\
-SET PATH=C:\Users\runneradmin\.conan\data\tbb\2020.3\_\_\package\e9a552ebe8f994398de9ceee972f0ad207df0658\lib\;%PATH%
-
 CD %PROJECT_DIR%\build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR