Revert to older state

CDCgov · Aug 21, 2024 · f2f407b · f2f407b
1 parent 578e4a7
commit f2f407b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 51 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,8 +2,8 @@ name: Publish Jar on Push to main
 
 on:
   workflow_dispatch:
-  # push:
-  #   branches: ['master']
+  push:
+    branches: ['master']
 
 jobs:
   publish:

diff --git a/.github/workflows/sbt-build.yml b/.github/workflows/sbt-build.yml
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1,6 @@
-sbt.version=1.8.0
+sbt.version=1.8.0
+<<<<<<< HEAD
+#sbt.version=1.0.0
+=======
+#sbt.version=1.0.4
+>>>>>>> 78c370b53da9a444962a2178ee2c33f169faea8d
diff --git a/project/build.sbt b/project/build.sbt
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1 @@
-//addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3")
-// sbt 1 only, see FAQ for 0.13 support
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "<version>")
+//addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3")