From 54f72d981889a1ae0506539298dae0d14c0f6def Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Thu, 16 Nov 2023 11:29:42 +0100 Subject: [PATCH] build: Align on tools from `.versions` also for the build / test workflow This implicitly upgrades ScanCode from version 31.2.4 to version 32.0.8. Signed-off-by: Sebastian Schuberth --- .github/workflows/build-and-test.yml | 14 ++++++-------- .versions | 3 +++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index bd49b53763c2e..3aa9dbc992606 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -10,10 +10,6 @@ on: env: GRADLE_OPTS: -Dorg.gradle.daemon=false - ASKALONO_VERSION: 0.4.6 - BOYTERLC_VERSION: 1.3.1 - LICENSEE_VERSION: 9.15.3 - SCANCODE_VERSION: 31.2.4 jobs: build: @@ -96,6 +92,12 @@ jobs: needs: build-web-app-reporter runs-on: ubuntu-22.04 steps: + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: recursive + - name: Set tool version environment variables + run: cat .versions >> $GITHUB_ENV - name: Install required tools run: | # Uninstall mono-devel because it contains the "lc" command which conflicts with BoyterLc. @@ -121,10 +123,6 @@ jobs: # Install ScanCode for license texts. curl -Os https://raw.githubusercontent.com/nexB/scancode-toolkit/v$SCANCODE_VERSION/requirements.txt pip install --no-cache-dir --constraint requirements.txt scancode-toolkit==$SCANCODE_VERSION - - name: Checkout Repository - uses: actions/checkout@v4 - with: - submodules: recursive - name: Setup Java uses: actions/setup-java@v3 with: diff --git a/.versions b/.versions index 2d25ec559be93..9c457d8ea0a65 100644 --- a/.versions +++ b/.versions @@ -1,5 +1,7 @@ ANDROID_CMD_VERSION=10406996 +ASKALONO_VERSION=0.4.6 BOWER_VERSION=1.8.12 +BOYTERLC_VERSION=1.3.1 COCOAPODS_VERSION=1.14.2 COMPOSER_VERSION=2.2 CONAN_VERSION=1.61.0 @@ -9,6 +11,7 @@ GO_DEP_VERSION=0.5.4 GO_VERSION=1.21.1 HASKELL_STACK_VERSION=2.13.1 JAVA_VERSION=17 +LICENSEE_VERSION=9.15.3 NODEJS_VERSION=20.9.0 NPM_VERSION=10.1.0 NUGET_INSPECTOR_VERSION=0.9.12