Skip to content

Commit

Permalink
Merge pull request #82 from sbt/wip/release
Browse files Browse the repository at this point in the history
sbt 1.9.0
  • Loading branch information
eed3si9n authored Jun 24, 2023
2 parents a56de64 + 8b10486 commit 8d27205
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 23 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,13 @@ jobs:
JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup Scala
uses: olafurpg/setup-scala@v10
uses: actions/checkout@v3
- name: Setup JDK
uses: actions/setup-java@v3
with:
java-version: "adopt@1.8"
- name: Coursier cache
uses: coursier/cache-action@v5
distribution: "temurin"
java-version: 8
cache: sbt
- name: Build and test
run: |
sbt -v clean scripted
rm -rf "$HOME/.ivy2/local" || true
find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true
find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true
find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true
find $HOME/.sbt
15 changes: 6 additions & 9 deletions .github/workflows/release.yml → .github/workflows/release.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,13 @@ jobs:
JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup Scala
uses: olafurpg/setup-scala@v10
uses: actions/checkout@v3
- name: Setup JDK
uses: actions/setup-java@v3
with:
java-version: "adopt@1.8"
- name: Coursier cache
uses: coursier/cache-action@v5
- name: Test
run: |
sbt test packagedArtifacts
distribution: "temurin"
java-version: 8
cache: sbt
- name: Release
env:
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / organization := "com.eed3si9n"
ThisBuild / dynverSonatypeSnapshots := true
// ThisBuild / dynverSonatypeSnapshots := true
ThisBuild / version := {
val orig = (ThisBuild / version).value
if (orig.endsWith("-SNAPSHOT")) "0.7.0-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.5
sbt.version=1.9.0
3 changes: 2 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
// addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")

0 comments on commit 8d27205

Please sign in to comment.