From c7d82847c3ee421eaced3c202dfe4b3d8a6bf12c Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 12 Nov 2022 11:56:12 +0100 Subject: [PATCH] wip --- .github/workflows/osrm-backend.yml | 125 +++-------------------------- bench.sh | 13 --- 2 files changed, 13 insertions(+), 125 deletions(-) delete mode 100644 bench.sh diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index f84174190..31d307ae6 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -273,60 +273,6 @@ jobs: CCOMPILER: gcc-7 CXXCOMPILER: g++-7 - - name: conan-macos-x64-release-node-16 - build_node_package: true - continue-on-error: false - node: 16 - runs-on: macos-11 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang - CXXCOMPILER: clang++ - CUCUMBER_TIMEOUT: 60000 - ENABLE_ASSERTIONS: ON - ENABLE_CONAN: ON - - - name: conan-macos-arm64-release-node-16 - build_node_package: true - continue-on-error: false - node: 16 - runs-on: macos-11 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang - CXXCOMPILER: clang++ - CUCUMBER_TIMEOUT: 60000 - ENABLE_ASSERTIONS: ON - ENABLE_CONAN: ON - ENABLE_APPLE_SILICON: ON - - - name: conan-macos-x64-release-node-18 - build_node_package: true - continue-on-error: false - node: 18 - runs-on: macos-11 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang - CXXCOMPILER: clang++ - CUCUMBER_TIMEOUT: 60000 - ENABLE_ASSERTIONS: ON - ENABLE_CONAN: ON - - - name: conan-macos-arm64-release-node-18 - build_node_package: true - continue-on-error: false - node: 18 - runs-on: macos-11 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang - CXXCOMPILER: clang++ - CUCUMBER_TIMEOUT: 60000 - ENABLE_ASSERTIONS: ON - ENABLE_CONAN: ON - ENABLE_APPLE_SILICON: ON - - name: gcc-7-release-shared continue-on-error: false node: 16 @@ -337,29 +283,7 @@ jobs: CCOMPILER: gcc-7 CXXCOMPILER: g++-7 - - name: node-16-conan-linux-release - build_node_package: true - continue-on-error: false - node: 16 - runs-on: ubuntu-20.04 - BUILD_TYPE: Release - CCOMPILER: clang-6.0 - CXXCOMPILER: clang++-6.0 - ENABLE_CONAN: ON - NODE_PACKAGE_TESTS_ONLY: ON - - - name: node-16-conan-linux-debug - build_node_package: true - continue-on-error: false - node: 16 - runs-on: ubuntu-20.04 - BUILD_TYPE: Debug - CCOMPILER: clang-6.0 - CXXCOMPILER: clang++-6.0 - ENABLE_CONAN: ON - NODE_PACKAGE_TESTS_ONLY: ON - - - name: node-18-conan-linux-release + - name: conan-linux-release-node build_node_package: true continue-on-error: false node: 18 @@ -370,7 +294,7 @@ jobs: ENABLE_CONAN: ON NODE_PACKAGE_TESTS_ONLY: ON - - name: node-18-conan-linux-debug + - name: conan-linux-debug-node build_node_package: true continue-on-error: false node: 18 @@ -381,10 +305,10 @@ jobs: ENABLE_CONAN: ON NODE_PACKAGE_TESTS_ONLY: ON - - name: conan-macos-x64-release-node-latest + - name: conan-macos-x64-release-node build_node_package: true continue-on-error: true - node: latest + node: 18 runs-on: macos-11 BUILD_TYPE: Release CCOMPILER: clang @@ -393,10 +317,10 @@ jobs: ENABLE_ASSERTIONS: ON ENABLE_CONAN: ON - - name: conan-macos-arm64-release-node-latest + - name: conan-macos-arm64-release-node build_node_package: true continue-on-error: true - node: latest + node: 18 runs-on: macos-11 BUILD_TYPE: Release CCOMPILER: clang @@ -406,28 +330,6 @@ jobs: ENABLE_CONAN: ON ENABLE_APPLE_SILICON: ON - - name: node-latest-conan-linux-release - build_node_package: true - continue-on-error: true - node: latest - runs-on: ubuntu-20.04 - BUILD_TYPE: Release - CCOMPILER: clang-6.0 - CXXCOMPILER: clang++-6.0 - ENABLE_CONAN: ON - NODE_PACKAGE_TESTS_ONLY: ON - - - name: node-latest-conan-linux-debug - build_node_package: true - continue-on-error: true - node: latest - runs-on: ubuntu-20.04 - BUILD_TYPE: Debug - CCOMPILER: clang-6.0 - CXXCOMPILER: clang++-6.0 - ENABLE_CONAN: ON - NODE_PACKAGE_TESTS_ONLY: ON - name: ${{ matrix.name}} continue-on-error: ${{ matrix.continue-on-error }} runs-on: ${{ matrix.runs-on }} @@ -641,33 +543,32 @@ jobs: uses: actions/setup-node@v3 with: node-version: 16 - - run: node --version - - name: Run Node package tests only + - name: Run Node package tests on Node 16 if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} run: | + node --version npm run nodejs-tests - name: Use Node 18 if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} uses: actions/setup-node@v3 with: node-version: 18 - - run: node --version - - name: Run Node package tests only + - name: Run Node package tests on Node 18 if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} run: | + node --version npm run nodejs-tests - name: Use Node latest if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} uses: actions/setup-node@v3 with: node-version: latest - - run: node --version - - name: Run Node package tests only + - name: Run Node package tests on Node-latest if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }} run: | + node --version npm run nodejs-tests - - run: nvm --version - + - name: Upload test logs uses: actions/upload-artifact@v3 if: failure() diff --git a/bench.sh b/bench.sh deleted file mode 100644 index 76202e030..000000000 --- a/bench.sh +++ /dev/null @@ -1,13 +0,0 @@ - -REGION=poland-latest - -# mkdir -p $REGION -# cd $REGION -# wget http://download.geofabrik.de/europe/$REGION.osm.pbf -# ../build/osrm-extract --profile ../profiles/car.lua $REGION.osm.pbf -# ../build/osrm-partition ./$REGION -# ../build/osrm-customize ./$REGION -# cd .. - - -node test/nodejs/benchmark.js $REGION/$REGION.osrm "18.638306,54.372158;19.944544,50.049683" \ No newline at end of file