From 55235fe7a2d972313b59b285d17fbc81c007a836 Mon Sep 17 00:00:00 2001 From: Gunnar Velle Date: Wed, 15 Jan 2025 10:18:36 +0100 Subject: [PATCH] Add sbt-runner --- .github/workflows/article-api_ci.yml | 1 + .github/workflows/audio-api_ci.yml | 1 + .github/workflows/common_ci.yml | 1 + .github/workflows/concept-api_ci.yml | 1 + .github/workflows/constants_ci.yml | 1 + .github/workflows/database_ci.yml | 1 + .github/workflows/draft-api_ci.yml | 1 + .github/workflows/formatting.yml | 1 + .github/workflows/frontpage-api_ci.yml | 1 + .github/workflows/image-api_ci.yml | 1 + .github/workflows/integration-tests_ci.yml | 1 + .github/workflows/language_ci.yml | 1 + .github/workflows/learningpath-api_ci.yml | 1 + .github/workflows/mapping_ci.yml | 1 + .github/workflows/myndla-api_ci.yml | 1 + .github/workflows/network_ci.yml | 1 + .github/workflows/oembed-proxy_ci.yml | 1 + .github/workflows/scalatestsuite_ci.yml | 1 + .github/workflows/search-api_ci.yml | 1 + .github/workflows/search_ci.yml | 1 + .github/workflows/tapirtesting_ci.yml | 1 + .github/workflows/typescript-generate.yml | 1 + .github/workflows/validation_ci.yml | 1 + project/GithubWorkflowPlugin.scala | 1 + 24 files changed, 24 insertions(+) diff --git a/.github/workflows/article-api_ci.yml b/.github/workflows/article-api_ci.yml index 641495c05..b734464e4 100644 --- a/.github/workflows/article-api_ci.yml +++ b/.github/workflows/article-api_ci.yml @@ -74,6 +74,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/audio-api_ci.yml b/.github/workflows/audio-api_ci.yml index d31b1b463..afbf96878 100644 --- a/.github/workflows/audio-api_ci.yml +++ b/.github/workflows/audio-api_ci.yml @@ -70,6 +70,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/common_ci.yml b/.github/workflows/common_ci.yml index e80cbecce..94a5deb9a 100644 --- a/.github/workflows/common_ci.yml +++ b/.github/workflows/common_ci.yml @@ -46,6 +46,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/concept-api_ci.yml b/.github/workflows/concept-api_ci.yml index 24ee43487..2780bb307 100644 --- a/.github/workflows/concept-api_ci.yml +++ b/.github/workflows/concept-api_ci.yml @@ -74,6 +74,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/constants_ci.yml b/.github/workflows/constants_ci.yml index e84acb213..46bb42f82 100644 --- a/.github/workflows/constants_ci.yml +++ b/.github/workflows/constants_ci.yml @@ -62,6 +62,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/database_ci.yml b/.github/workflows/database_ci.yml index fecc70dfa..b522c35ce 100644 --- a/.github/workflows/database_ci.yml +++ b/.github/workflows/database_ci.yml @@ -46,6 +46,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/draft-api_ci.yml b/.github/workflows/draft-api_ci.yml index 3a2091dd1..3fedffce9 100644 --- a/.github/workflows/draft-api_ci.yml +++ b/.github/workflows/draft-api_ci.yml @@ -74,6 +74,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 6f34046a4..6c62754c4 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -21,6 +21,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/frontpage-api_ci.yml b/.github/workflows/frontpage-api_ci.yml index 7bb1b19c1..0fa63bf9e 100644 --- a/.github/workflows/frontpage-api_ci.yml +++ b/.github/workflows/frontpage-api_ci.yml @@ -66,6 +66,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/image-api_ci.yml b/.github/workflows/image-api_ci.yml index 8b0435af5..a0d7bfcc7 100644 --- a/.github/workflows/image-api_ci.yml +++ b/.github/workflows/image-api_ci.yml @@ -70,6 +70,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/integration-tests_ci.yml b/.github/workflows/integration-tests_ci.yml index 2a978cc9d..ea5fe8a4a 100644 --- a/.github/workflows/integration-tests_ci.yml +++ b/.github/workflows/integration-tests_ci.yml @@ -62,6 +62,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/language_ci.yml b/.github/workflows/language_ci.yml index 3927152e7..0735830f8 100644 --- a/.github/workflows/language_ci.yml +++ b/.github/workflows/language_ci.yml @@ -38,6 +38,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/learningpath-api_ci.yml b/.github/workflows/learningpath-api_ci.yml index a2d0e1dad..d072ead23 100644 --- a/.github/workflows/learningpath-api_ci.yml +++ b/.github/workflows/learningpath-api_ci.yml @@ -70,6 +70,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/mapping_ci.yml b/.github/workflows/mapping_ci.yml index 0aed28a85..2cda93050 100644 --- a/.github/workflows/mapping_ci.yml +++ b/.github/workflows/mapping_ci.yml @@ -38,6 +38,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/myndla-api_ci.yml b/.github/workflows/myndla-api_ci.yml index ca01818c1..f40bd7d01 100644 --- a/.github/workflows/myndla-api_ci.yml +++ b/.github/workflows/myndla-api_ci.yml @@ -66,6 +66,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/network_ci.yml b/.github/workflows/network_ci.yml index ee2f41216..b61d6d643 100644 --- a/.github/workflows/network_ci.yml +++ b/.github/workflows/network_ci.yml @@ -42,6 +42,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/oembed-proxy_ci.yml b/.github/workflows/oembed-proxy_ci.yml index 96ea8e1d1..10aea089a 100644 --- a/.github/workflows/oembed-proxy_ci.yml +++ b/.github/workflows/oembed-proxy_ci.yml @@ -58,6 +58,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/scalatestsuite_ci.yml b/.github/workflows/scalatestsuite_ci.yml index 8e637ffe0..35022ed3f 100644 --- a/.github/workflows/scalatestsuite_ci.yml +++ b/.github/workflows/scalatestsuite_ci.yml @@ -38,6 +38,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/search-api_ci.yml b/.github/workflows/search-api_ci.yml index e05acde44..35b8f5036 100644 --- a/.github/workflows/search-api_ci.yml +++ b/.github/workflows/search-api_ci.yml @@ -70,6 +70,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/search_ci.yml b/.github/workflows/search_ci.yml index f2f5679f8..716e597f8 100644 --- a/.github/workflows/search_ci.yml +++ b/.github/workflows/search_ci.yml @@ -54,6 +54,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/tapirtesting_ci.yml b/.github/workflows/tapirtesting_ci.yml index bbb30ddbe..91ec40a4f 100644 --- a/.github/workflows/tapirtesting_ci.yml +++ b/.github/workflows/tapirtesting_ci.yml @@ -50,6 +50,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/.github/workflows/typescript-generate.yml b/.github/workflows/typescript-generate.yml index 2846b6314..2b1ab3af1 100644 --- a/.github/workflows/typescript-generate.yml +++ b/.github/workflows/typescript-generate.yml @@ -29,6 +29,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - uses: actions/setup-node@v3 with: node-version: '18.12' diff --git a/.github/workflows/validation_ci.yml b/.github/workflows/validation_ci.yml index c79e218d0..8ec340082 100644 --- a/.github/workflows/validation_ci.yml +++ b/.github/workflows/validation_ci.yml @@ -42,6 +42,7 @@ jobs: with: distribution: temurin java-version: '20' + - uses: sbt/setup-sbt@v1 - name: Login to ECR repo run: RES=$(aws sts assume-role --role-arn $CI_RELEASE_ROLE --role-session-name github-actions-ecr-login) AWS_ACCESS_KEY_ID=$(echo $RES | jq -r .Credentials.AccessKeyId) diff --git a/project/GithubWorkflowPlugin.scala b/project/GithubWorkflowPlugin.scala index 7724848d4..1eac7c3b2 100644 --- a/project/GithubWorkflowPlugin.scala +++ b/project/GithubWorkflowPlugin.scala @@ -225,6 +225,7 @@ object GithubWorkflowPlugin extends AutoPlugin { | with: | distribution: temurin | java-version: '$workflowJavaVersion' + | - uses: sbt/setup-sbt@v1 | - name: Login to ECR repo | run: RES=$$(aws sts assume-role --role-arn $$CI_RELEASE_ROLE --role-session-name | github-actions-ecr-login) AWS_ACCESS_KEY_ID=$$(echo $$RES | jq -r .Credentials.AccessKeyId)