From 8acbc5cb288e8f65439519afe39a8e33d36dc2a3 Mon Sep 17 00:00:00 2001 From: Robin Bourianes Date: Tue, 23 Jul 2024 11:10:26 +0200 Subject: [PATCH] ci: default tests using node20, additional tests using node{18,22} --- .github/workflows/main.yaml | 5 ++--- scripts/init_runner.sh | 4 ++-- scripts/kash | 2 +- scripts/run_tests.sh | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a7dbd01..13f0f98 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -26,8 +26,7 @@ jobs: strategy: fail-fast: false matrix: - node: [ 18, 20 ] - mongo: [ 5, 6, 7 ] + node: [ 18, 22 ] name: Additional tests if: ${{ contains(github.event.head_commit.message, 'additional tests') }} runs-on: ubuntu-22.04 @@ -45,7 +44,7 @@ jobs: - name: Run tests env: SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }} - run: bash ./scripts/run_tests.sh -n ${{ matrix.node }} -m ${{ matrix.mongo }} + run: bash ./scripts/run_tests.sh -n ${{ matrix.node }} build_service: name: Build service diff --git a/scripts/init_runner.sh b/scripts/init_runner.sh index 530e7e2..47b7539 100644 --- a/scripts/init_runner.sh +++ b/scripts/init_runner.sh @@ -12,11 +12,11 @@ THIS_DIR=$(dirname "$THIS_FILE") ### Github Actions init_github_run_tests() { - install_reqs age sops nvm node16 cc_test_reporter + install_reqs age sops nvm node20 cc_test_reporter } init_github_additional_tests() { - install_reqs age sops nvm node18 node20 mongo5 mongo6 mongo7 + install_reqs age sops nvm node18 node22 } init_github_build_service() { diff --git a/scripts/kash b/scripts/kash index abf5d66..d7d0327 160000 --- a/scripts/kash +++ b/scripts/kash @@ -1 +1 @@ -Subproject commit abf5d6618b29811366eb5529d913fbf3e961e041 +Subproject commit d7d03279003c18e107b8172447d71fd8429bbaef diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index fc17530..c430444 100644 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -12,7 +12,7 @@ WORKSPACE_DIR="$(dirname "$ROOT_DIR")" ## Parse options ## -NODE_VER=16 +NODE_VER=20 MONGO_VER="" CI_STEP_NAME="Run tests" CODE_COVERAGE=false