Merge branch 'scalacenter:main' into main

Author: yazgoo

README.md

@@ -51,6 +51,17 @@ A list of space-separated names of configurations to ignore. The action will not
 
 Example of configurations are `compile`, `test`, `scala-tool`, `scala-doc-tool`.
 
+### - `correlator` (optional)
+
+An optional identifier to distinguish between multiple dependency snapshots of the same type.
+Defaults to the concatenation of the workflow name, the job id and the action id.
+
+Typically you would specify the correlator in a matrix-based job like this:
+
+```yaml
+  correlator: ${{ github.job }}-${{ matrix.directory }}
+```
+
 #### - `token` (optional)
 
 GitHub Personal Access Token (PAT). Defaults to PAT provided by Action runner.
@@ -115,7 +126,7 @@ To do so you need to install the `sbt-dependency-submission` plugin in your sbt
 
 ```scala
 // In project/plugins.sbt
-addSbtPlugin("ch.epfl.scala" % "sbt-github-dependency-submission" % "3.0.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-github-dependency-submission" % "3.1.0")
 ```
 
 After reloading your build, you can run:

action.yml

@@ -22,6 +22,12 @@ inputs:
       Example: `test scala-doc-tool`
     required: false
     default: ''
+  correlator:
+    description: |
+      An optional identifier to distinguish between multiple dependency snapshots of the same type.
+      Defaults to the concatenation of the workflow name, the job id and the action id.
+    required: false
+    default: ''
   on-resolve-failure:
     description: |
       Either 'error' or 'warning'.
@@ -36,7 +42,7 @@ inputs:
   sbt-plugin-version:
     description: Version of the sbt plugin to use.
     required: false
-    default: '3.0.1'
+    default: '3.1.0'
 outputs:
   submission-id:
     description: The ID of the submission created by the action

dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "sbt-dependency-submission",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "private": true,
   "description": "Submit the dependency graph of an sbt build to Github",
   "main": "lib/main.js",

dist/index.js.map

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.3

package-lock.json

@@ -1,4 +1,4 @@
-version = "3.8.1"
+version = "3.8.3"
 runner.dialect = scala212source3
 maxColumn = 120
 align.preset = some

package.json

@@ -27,7 +27,7 @@ val `sbt-github-dependency-submission` = project
   .settings(
     name := "sbt-github-dependency-submission",
     sbtVersion := "1.5.8",
-    scalaVersion := "2.12.19",
+    scalaVersion := "2.12.20",
     scalacOptions ++= Seq(
       "-deprecation",
       "-encoding",
@@ -39,7 +39,7 @@ val `sbt-github-dependency-submission` = project
     ),
     libraryDependencies ++= Seq(
       "com.eed3si9n" %% "gigahorse-asynchttpclient" % "0.7.0",
-      "org.scalameta" %% "munit" % "1.0.0" % Test
+      "org.scalameta" %% "munit" % "1.0.2" % Test
     ),
     buildInfoKeys := Seq[BuildInfoKey](name, version, homepage),
     buildInfoPackage := "ch.epfl.scala",

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.3

sbt-plugin/.scalafmt.conf

@@ -1,4 +1,4 @@
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
-addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
+addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.6.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")

sbt-plugin/build.sbt

@@ -23,4 +23,7 @@ type DependencySnapshotInput {
   ##  - "scala-doc-tool" to ignore the scaladoc dependencies
   ##  - "scala-tool" to ignore the compiler dependencies
   ignoredConfigs: [String]
+
+  ## The job correlator of the snapshot
+  correlator: String
 }

sbt-plugin/project/build.properties

@@ -42,7 +42,7 @@ object SubmitDependencyGraph {
   private def inputParser(state: State): Parser[DependencySnapshotInput] =
     Parsers.any.*.map { raw =>
       val rawString = raw.mkString
-      if (rawString.isEmpty) DependencySnapshotInput(None, Vector.empty, Vector.empty)
+      if (rawString.isEmpty) DependencySnapshotInput(None, Vector.empty, Vector.empty, Some(""))
       else
         JsonParser
           .parseFromString(rawString)
@@ -82,7 +82,8 @@ object SubmitDependencyGraph {
   }
 
   private def generateInternal(state: State): State = {
-    val snapshot = githubDependencySnapshot(state)
+    val input = state.attributes(githubSnapshotInputKey)
+    val snapshot = githubDependencySnapshot(state, input.correlator.getOrElse(""))
     val snapshotJson = CompactPrinter(Converter.toJsonUnsafe(snapshot))
     val snapshotJsonFile = IO.withTemporaryFile("dependency-snapshot-", ".json", keepFile = true) { file =>
       IO.write(file, snapshotJson)
@@ -103,7 +104,8 @@ object SubmitDependencyGraph {
         )
       )
     val snapshotUrl = s"${githubApiUrl()}/repos/${githubRepository()}/dependency-graph/snapshots"
-    val job = githubJob()
+    val input = state.attributes(githubSnapshotInputKey)
+    val job = githubJob(input.correlator.getOrElse(""))
     val request = Gigahorse
       .url(snapshotUrl)
       .post(snapshotJsonFile)
@@ -145,7 +147,7 @@ object SubmitDependencyGraph {
         throw new MessageOnlyException(message)
     }
 
-  private def githubDependencySnapshot(state: State): DependencySnapshot = {
+  private def githubDependencySnapshot(state: State, correlator: String): DependencySnapshot = {
     val detector = DetectorMetadata(
       SbtGithubDependencySubmission.name,
       SbtGithubDependencySubmission.homepage.map(_.toString).getOrElse(""),
@@ -155,7 +157,7 @@ object SubmitDependencyGraph {
     val manifests = state.get(githubManifestsKey).get
     DependencySnapshot(
       0,
-      githubJob(),
+      githubJob(correlator),
       githubSha(),
       githubRef(),
       detector,
@@ -165,8 +167,7 @@ object SubmitDependencyGraph {
     )
   }
 
-  private def githubJob(): Job = {
-    val correlator = s"${githubWorkflow()}_${githubJobName()}_${githubAction()}"
+  private def githubJob(correlator: String): Job = {
     val id = githubRunId
     val html_url =
       for {
@@ -181,9 +182,6 @@ object SubmitDependencyGraph {
       throw new MessageOnlyException(s"Missing environment variable $name. This task must run in a Github Action.")
     }
     check("GITHUB_WORKSPACE")
-    check("GITHUB_WORKFLOW")
-    check("GITHUB_JOB")
-    check("GITHUB_ACTION")
     check("GITHUB_RUN_ID")
     check("GITHUB_SHA")
     check("GITHUB_REF")
@@ -194,9 +192,6 @@ object SubmitDependencyGraph {
   }
 
   private def githubWorkspace(): String = Properties.envOrElse("GITHUB_WORKSPACE", "")
-  private def githubWorkflow(): String = Properties.envOrElse("GITHUB_WORKFLOW", "")
-  private def githubJobName(): String = Properties.envOrElse("GITHUB_JOB", "")
-  private def githubAction(): String = Properties.envOrElse("GITHUB_ACTION", "")
   private def githubRunId(): String = Properties.envOrElse("GITHUB_RUN_ID", "")
   private def githubSha(): String = Properties.envOrElse("GITHUB_SHA", "")
   private def githubRef(): String = Properties.envOrElse("GITHUB_REF", "")

sbt-plugin/project/plugins.sbt

@@ -10,7 +10,7 @@ inThisBuild(
     organization := "ch.epfl.scala",
     version := "1.2.0-SNAPSHOT",
     useCoursier := true,
-    scalaVersion := "2.12.19"
+    scalaVersion := "2.12.20"
   )
 )
 

sbt-plugin/src/main/contraband/input.contra

@@ -17,7 +17,7 @@ inThisBuild(
 )
 
 Global / ignoreScaladoc := {
-  val input = DependencySnapshotInput(None, Vector.empty, ignoredConfigs = Vector("scala-doc-tool"))
+  val input = DependencySnapshotInput(None, Vector.empty, ignoredConfigs = Vector("scala-doc-tool"), correlator = None)
   StateTransform(state => state.put(githubSnapshotInputKey, input))
 }
 

sbt-plugin/src/main/scala/ch/epfl/scala/SubmitDependencyGraph.scala

@@ -17,17 +17,17 @@ inThisBuild(
 )
 
 Global / ignoreTestConfig := {
-  val input = DependencySnapshotInput(None, Vector.empty, ignoredConfigs = Vector("test"))
+  val input = DependencySnapshotInput(None, Vector.empty, ignoredConfigs = Vector("test"), correlator = None)
   StateTransform(state => state.put(githubSnapshotInputKey, input))
 }
 
 lazy val p1 = project
   .in(file("p1"))
   .settings(
-    libraryDependencies += "org.scalameta" %% "munit" % "1.0.0" % Test,
+    libraryDependencies += "org.scalameta" %% "munit" % "1.0.2" % Test,
     checkTest := {
       val manifest = githubDependencyManifest.value.get
-      checkDependency(manifest, "org.scalameta:munit_3:1.0.0")(
+      checkDependency(manifest, "org.scalameta:munit_3:1.0.2")(
         expectedRelationship = DependencyRelationship.direct,
         expectedScope = DependencyScope.development,
         expectedConfig = "test"

sbt-plugin/src/sbt-test/dependency-manifest/coursier-manifest/build.sbt

@@ -10,7 +10,7 @@ inThisBuild(
     organization := "ch.epfl.scala",
     version := "1.2.0-SNAPSHOT",
     useCoursier := false, // use Ivy
-    scalaVersion := "2.12.19"
+    scalaVersion := "2.12.20"
   )
 )
 

sbt-plugin/src/sbt-test/dependency-manifest/ignore-scaladoc/build.sbt

@@ -11,7 +11,7 @@ inThisBuild(
     version := "1.2.0-SNAPSHOT",
     // use Ivy because Coursier does not allow several classifier on the same dep
     useCoursier := false,
-    scalaVersion := "2.12.19"
+    scalaVersion := "2.12.20"
   )
 )
 

sbt-plugin/src/sbt-test/dependency-manifest/ignore-test/build.sbt

@@ -30,15 +30,15 @@ class JsonProtocolTests extends FunSuite {
     import ch.epfl.scala.JsonProtocol._
     val raw = Parser.parseUnsafe("{}")
     val obtained = Converter.fromJson[DependencySnapshotInput](raw).get
-    val expected = DependencySnapshotInput(None, Vector.empty, Vector.empty)
+    val expected = DependencySnapshotInput(None, Vector.empty, Vector.empty, None)
     assertEquals(obtained, expected)
   }
 
   test("decode input with onResolveFailure: warning") {
     import ch.epfl.scala.JsonProtocol._
     val raw = Parser.parseUnsafe("""{"onResolveFailure": "warning"}""")
     val obtained = Converter.fromJson[DependencySnapshotInput](raw).get
-    val expected = DependencySnapshotInput(Some(OnFailure.warning), Vector.empty, Vector.empty)
+    val expected = DependencySnapshotInput(Some(OnFailure.warning), Vector.empty, Vector.empty, None)
     assertEquals(obtained, expected)
   }
 }

sbt-plugin/src/sbt-test/dependency-manifest/ivy-manifest/build.sbt

@@ -48,7 +48,12 @@ async function run(): Promise<void> {
       return
     }
 
-    const input = { ignoredModules, ignoredConfigs, onResolveFailure }
+    const correlatorInput = core.getInput('correlator')
+    const correlator = correlatorInput
+      ? correlatorInput
+      : `${github.context.workflow}_${github.context.job}_${github.context.action}`
+
+    const input = { ignoredModules, ignoredConfigs, onResolveFailure, correlator }
 
     if (github.context.eventName === 'pull_request') {
       core.info('pull request, resetting sha')