From a2a638c113f0e2f952ea59e21f6e1f6a45f81ab3 Mon Sep 17 00:00:00 2001
From: Michael Pollmeier <michael@michaelpollmeier.com>
Date: Thu, 11 Nov 2021 11:22:22 +0100
Subject: [PATCH] upgrade scala to 2.13.7 and release sequentially

---
 .github/workflows/release.yml                                 | 1 +
 build.sbt                                                     | 4 ++--
 .../io/shiftleft/js2cpg/cpg/passes/CfgCreationPassTest.scala  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 16f9a567b..f6e0101b4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,7 @@ on:
     tags: ["*"]
 jobs:
   release:
+    concurrency: release
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
diff --git a/build.sbt b/build.sbt
index 775528b86..1fc33136e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-val cpgVersion = "1.3.390"
+val cpgVersion = "1.3.429"
 
 val gitCommitString = SettingKey[String]("gitSha")
 
@@ -15,7 +15,7 @@ Global / excludeLintKeys += Fast / configuration
 Global / excludeLintKeys += gitCommitString
 
 lazy val commonSettings = Seq(
-  scalaVersion := "2.13.6",
+  scalaVersion := "2.13.7",
   organization := "io.shiftleft",
   scalacOptions ++= Seq(
     // Emit warning and location for usages of deprecated APIs.
diff --git a/src/test/scala/io/shiftleft/js2cpg/cpg/passes/CfgCreationPassTest.scala b/src/test/scala/io/shiftleft/js2cpg/cpg/passes/CfgCreationPassTest.scala
index 163d74e41..0e65e8f51 100644
--- a/src/test/scala/io/shiftleft/js2cpg/cpg/passes/CfgCreationPassTest.scala
+++ b/src/test/scala/io/shiftleft/js2cpg/cpg/passes/CfgCreationPassTest.scala
@@ -6,8 +6,8 @@ import io.shiftleft.codepropertygraph.generated._
 import io.shiftleft.js2cpg.core.Report
 import io.shiftleft.passes.IntervalKeyPool
 import io.shiftleft.semanticcpg.language._
-import io.shiftleft.semanticcpg.passes.CfgCreationPass
-import io.shiftleft.semanticcpg.passes.cfgcreation.Cfg._
+import io.shiftleft.semanticcpg.passes.controlflow.CfgCreationPass
+import io.shiftleft.semanticcpg.passes.controlflow.cfgcreation.Cfg._
 import overflowdb.traversal._
 import overflowdb._