Merge pull request #561 from armanbilge/fix/submit-deps-sbt-step-prea…

…mble Clear sbt step preamble in dependency submission job
typelevel · Jun 23, 2023 · 5955d40 · 5955d40
2 parents c46d880 + d1afa62
commit 5955d40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -329,7 +329,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
-        run: sbt '++ ${{ matrix.scala }}' reload +update
+        run: sbt reload +update
 
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
@@ -342,7 +342,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
-        run: sbt '++ ${{ matrix.scala }}' reload +update
+        run: sbt reload +update
 
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
@@ -355,7 +355,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
-        run: sbt '++ ${{ matrix.scala }}' reload +update
+        run: sbt reload +update
 
       - name: Setup Java (graalvm@17)
         id: setup-java-graalvm-17
@@ -368,7 +368,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
-        run: sbt '++ ${{ matrix.scala }}' reload +update
+        run: sbt reload +update
 
       - name: Setup Java (corretto@17)
         id: setup-java-corretto-17
@@ -381,7 +381,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'corretto@17' && steps.setup-java-corretto-17.outputs.cache-hit == 'false'
-        run: sbt '++ ${{ matrix.scala }}' reload +update
+        run: sbt reload +update
 
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2

diff --git a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala
@@ -143,6 +143,7 @@ object TypelevelCiPlugin extends AutoPlugin {
               "dependency-submission",
               "Submit Dependencies",
               scalas = Nil,
+              sbtStepPreamble = Nil,
               javas = List(githubWorkflowJavaVersions.value.head),
               steps = githubWorkflowJobSetup.value.toList :+
                 WorkflowStep.DependencySubmission(