Merge pull request #341 from armanbilge/topic/submit-deps-cond

Move submit-dependencies condition to job-level, not step-level
typelevel · Jul 17, 2022 · 9f609da · 9f609da
2 parents 0aa7d07 + 17f8ff4
commit 9f609da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -210,6 +210,7 @@ jobs:
 
   dependency-submission:
     name: Submit Dependencies
+    if: github.event_name != 'pull_request'
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -267,7 +268,6 @@ jobs:
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Submit Dependencies
-        if: github.event_name != 'pull_request'
         uses: scalacenter/sbt-dependency-submission@v2
 
   site:

diff --git a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala
@@ -143,9 +143,8 @@ object TypelevelCiPlugin extends AutoPlugin {
               scalas = List(scalaVersion.value),
               javas = List(githubWorkflowJavaVersions.value.head),
               steps = githubWorkflowJobSetup.value.toList :+
-                WorkflowStep
-                  .DependencySubmission
-                  .withCond(Some("github.event_name != 'pull_request'"))
+                WorkflowStep.DependencySubmission,
+              cond = Some("github.event_name != 'pull_request'")
             ))
         else Nil