Merge branch 'develop' into update/slick-3.5.1

.git-blame-ignore-revs

@@ -26,3 +26,9 @@ a4933777d38af3b80fdf1d70bf1f5cac3b84ec9d
 
 # Scala Steward: Reformat with scalafmt 3.8.1
 f5916aefb603a97498617785baa46bf5cf9e3164
+
+# Scala Steward: Reformat with scalafmt 3.8.2
+05e4a08678f9bbb106760fa5e542e3ca19cff068
+
+# Scala Steward: Reformat with scalafmt 3.8.3
+4ff2c5aaf0cd1acfbf510d0ffc9391849c16e9e3

.github/workflows/rawls-build-tag-publish-and-run-tests.yaml

@@ -24,19 +24,23 @@ jobs:
       release-branches: develop
     secrets: inherit
 
-  # Compile the Scala code to a jar.
-  # Build the docker image and push that image to GCR.
-  rawls-build-publish-job:
+  # Set the test-context: is this a merge to `develop` or is this a PR? Extract branch accordingly
+  init-github-context:
     runs-on: ubuntu-latest
-    needs: tag-job
-    permissions:
-      contents: 'read'
-      id-token: 'write'
     outputs:
-      custom-version-json: ${{ steps.render-rawls-version.outputs.custom-version-json }}
+      log-results: ${{ steps.set-test-context.outputs.log-results }}
+      test-context: ${{ steps.set-test-context.outputs.test-context }}
+      ref: ${{ steps.extract-branch.outputs.ref }}
     steps:
-      - uses: 'actions/checkout@v4'
-
+      - name: Get test context
+        id: set-test-context
+        run: |-
+          echo 'log-results=true' >> $GITHUB_OUTPUT
+          if ${{ github.ref_name == 'develop' }}; then
+            echo 'test-context=dev-merge' >> $GITHUB_OUTPUT
+          else
+            echo 'test-context=pr-test' >> $GITHUB_OUTPUT
+          fi
       - name: Extract branch
         id: extract-branch
         run: |
@@ -55,6 +59,21 @@ jobs:
           echo "ref=$GITHUB_REF" >> $GITHUB_OUTPUT
           echo "name=$GITHUB_SHA" >> $GITHUB_OUTPUT
 
+  # Compile the Scala code to a jar.
+  # Build the docker image and push that image to GCR.
+  rawls-build-publish-job:
+    runs-on: ubuntu-latest
+    needs:
+      - tag-job
+      - init-github-context
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+    outputs:
+      custom-version-json: ${{ steps.render-rawls-version.outputs.custom-version-json }}
+    steps:
+      - uses: 'actions/checkout@v4'
+
       - name: dispatch build to terra-github-workflows
         uses: broadinstitute/[email protected]
         with:
@@ -66,7 +85,7 @@ jobs:
           inputs: '{
             "run-name": "${{ env.RAWLS_BUILD_RUN_NAME }}",
             "repository": "${{ github.event.repository.full_name }}",
-            "ref": "${{ steps.extract-branch.outputs.ref }}",
+            "ref": "${{ needs.init-github-context.outputs.ref }}",
             "rawls-release-tag": "${{ needs.tag-job.outputs.tag }}"
           }'
 
@@ -79,22 +98,6 @@ jobs:
           echo "custom-version-json={\\\"rawls\\\":{\\\"appVersion\\\":\\\"${{ needs.tag-job.outputs.tag }}\\\"}}" >> $GITHUB_OUTPUT
 
 
-  # Set the test-context: is this a merge to `develop` or is this a PR?
-  init-github-context:
-    runs-on: ubuntu-latest
-    outputs:
-      log-results: ${{ steps.set-test-context.outputs.log-results }}
-      test-context: ${{ steps.set-test-context.outputs.test-context }}
-    steps:
-      - name: Get test context
-        id: set-test-context
-        run: |-
-          echo 'log-results=true' >> $GITHUB_OUTPUT
-          if ${{ github.ref_name == 'develop' }}; then
-            echo 'test-context=dev-merge' >> $GITHUB_OUTPUT
-          else
-            echo 'test-context=pr-test' >> $GITHUB_OUTPUT
-          fi
 
   # Tell Broad DevOps Sherlock about the build version we just created.
   report-to-sherlock:
@@ -200,7 +203,8 @@ jobs:
             "ENV": "${{ matrix.testing-env }}",
             "test-group-name": "${{ matrix.test-group.group_name }}",
             "test-command": "${{ env.rawls_base_test_entrypoint }} ${{ matrix.test-group.tag }}",
-            "test-context": "${{ env.test-context }}"
+            "test-context": "${{ env.test-context }}",
+            "ref": "${{ needs.init-github-context.outputs.ref }}"
           }'
 
   # Delete the BEE, now that swat tests are done.

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.8.1
+version = 3.8.3
 align = none
 align.openParenCallSite = true
 align.openParenDefnSite = true

Dockerfile

@@ -1,3 +1,9 @@
+# TODO: Replace build script with multi-stage Dockerfile that builds its own JAR
+# FROM sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.0_2.13.14 as jar-builder
+# ...build JAR...
+# FROM us.gcr.io/broad-dsp-gcr-public/base/jre:17-debian
+# COPY --from=jar-builder ./rawls*.jar /rawls
+
 FROM us.gcr.io/broad-dsp-gcr-public/base/jre:17-debian
 
 # To run, must build the jar using ./docker/build.sh

automation/Dockerfile-tests

@@ -1,4 +1,4 @@
-FROM sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.9.9_2.13.13
+FROM sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.0_2.13.14
 
 COPY src /app/src
 COPY test.sh /app

automation/project/Dependencies.scala

@@ -5,13 +5,13 @@ object Dependencies {
 
   val akkaV         = "2.6.8"
   val akkaHttpV     = "10.2.0"
-  val jacksonV      = "2.17.1"
+  val jacksonV      = "2.17.2"
 
-  val workbenchLibsHash = "3a8f98c"
-  val serviceTestV = s"4.4-${workbenchLibsHash}"
-  val workbenchGoogleV = s"0.30-${workbenchLibsHash}"
+  val workbenchLibsHash = "d47b6d4"
+  val serviceTestV = s"5.0-${workbenchLibsHash}"
+  val workbenchGoogleV = s"0.32-${workbenchLibsHash}"
   val workbenchGoogle2V = s"0.36-${workbenchLibsHash}"
-  val workbenchModelV  = s"0.19-${workbenchLibsHash}"
+  val workbenchModelV  = s"0.20-${workbenchLibsHash}"
   val workbenchMetricsV  = s"0.8-${workbenchLibsHash}"
 
   val workbenchModel: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-model" % workbenchModelV
@@ -28,7 +28,7 @@ object Dependencies {
   val workbenchGoogle2: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-google2" % workbenchGoogle2V exclude ("org.slf4j", "slf4j-api")
   val workbenchServiceTest: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-service-test" % serviceTestV % "test" classifier "tests" excludeAll(workbenchExclusions :+ rawlsModelExclusion:_*)
 
-  val workspaceManager: ModuleID = "bio.terra" % "workspace-manager-client" % "0.254.1116-SNAPSHOT"
+  val workspaceManager: ModuleID = "bio.terra" % "workspace-manager-client" % "0.254.1142-SNAPSHOT"
   val dataRepo: ModuleID         = "bio.terra" % "datarepo-client" % "1.41.0-SNAPSHOT"
   val dataRepoJersey : ModuleID  = "org.glassfish.jersey.inject" % "jersey-hk2" % "2.32" // scala-steward:off (must match TDR)
 
@@ -57,7 +57,7 @@ object Dependencies {
     "org.scalatest"       %%  "scalatest"     % "3.2.2"   % Test,
     "org.seleniumhq.selenium" % "selenium-java" % "3.8.1" % Test,
     "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
-    "org.broadinstitute.dsde"       %% "rawls-model"         % "1824ef0eb"
+    "org.broadinstitute.dsde"       %% "rawls-model"         % "339209ac"
       exclude("com.typesafe.scala-logging", "scala-logging_2.13")
       exclude("com.typesafe.akka", "akka-stream_2.13")
       exclude("bio.terra", "workspace-manager-client"),

automation/project/Settings.scala

@@ -38,7 +38,7 @@ object Settings {
   val commonSettings =
     commonBuildSettings ++ testSettings ++ List(
     organization  := "org.broadinstitute.dsde.firecloud",
-    scalaVersion  := "2.13.13",
+    scalaVersion  := "2.13.14",
     resolvers ++= commonResolvers,
     scalacOptions ++= commonCompilerSettings
   )

automation/project/build.properties

@@ -1 +1 @@
-sbt.version = 1.9.9
+sbt.version = 1.10.1