Merge pull request #147 from TouK/staging

Merge staging to main
TouK · Sep 12, 2023 · eabb530 · eabb530
2 parents 358e333 + c7e8288
commit eabb530
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/benchmark-workflow.yml b/.github/workflows/benchmark-workflow.yml
@@ -21,7 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     env:
       # temporarily force NU built with scala 2.12, cause default build (2.13) does not work with Flink out of the box now.
-      NUSSKNACKER_VERSION: ${{ inputs.nussknacker_version != '' && inputs.nussknacker_version || 'staging-latest_scala-2.12' }}
+      NUSSKNACKER_VERSION: ${{
+        endsWith(inputs.nussknacker_version, 'SNAPSHOT') && format('{0}_{1}', inputs.nussknacker_version, 'scala-2.12') ||
+        inputs.nussknacker_version != '' && inputs.nussknacker_version ||
+        'staging-latest_scala-2.12' }}
     defaults:
       run:
         shell: bash

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -24,12 +24,15 @@ env:
   NUSSKNACKER_VERSION: ${{ inputs.nussknacker_version != '' && inputs.nussknacker_version || (github.base_ref == 'staging' || github.ref_name == 'staging') && 'staging-latest' || 'latest' }}
 
 jobs:
-
   docker-compose-streaming-test:
     runs-on: ubuntu-latest
     env:
       # temporarily force NU built with scala 2.12, cause default build (2.13) does not work with Flink out of the box now.
-      NUSSKNACKER_VERSION: ${{ inputs.nussknacker_version != '' && inputs.nussknacker_version || (github.base_ref == 'staging' || github.ref_name == 'staging') && 'staging-latest_scala-2.12' || 'latest_scala-2.12' }}
+      NUSSKNACKER_VERSION: ${{
+        endsWith(inputs.nussknacker_version, 'SNAPSHOT') && format('{0}_{1}', inputs.nussknacker_version, 'scala-2.12') ||
+        inputs.nussknacker_version != '' && inputs.nussknacker_version ||
+        (github.base_ref == 'staging' || github.ref_name == 'staging') && 'staging-latest_scala-2.12' ||
+        'latest_scala-2.12' }}
     steps:
       - name: Cancel previous runs
         uses: styfle/[email protected]