Skip to content

Commit

Permalink
Update GitHub Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
eed3si9n committed Oct 26, 2023
1 parent 6003a51 commit d262050
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 28 deletions.
35 changes: 19 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,32 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
include:
- java: 8
scala: 2.12.8
- java: 11
scala: 2.12.8
- os: ubuntu-latest
java: 8
distribution: temurin
- os: ubuntu-latest
java: 11
distribution: temurin
- os: ubuntu-latest
java: 21
distribution: temurin
- os: windows-latest
java: 11
distribution: temurin
env:
# define Java options for both official sbt and sbt-extras
JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v10
- uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
with:
java-version: "adopt@1.${{ matrix.java }}"
- uses: coursier/cache-action@v5
distribution: "${{ matrix.distribution }}"
java-version: "${{ matrix.java }}"
cache: sbt
- name: Build and test
shell: bash
run: |
sbt -v +publishLocal $(if [[ "${{matrix.scala}}" != "" ]] ; then echo "++${{matrix.scala}}!" ; fi) test scripted
rm -rf "$HOME/.ivy2/local" || true
rm -rf "$HOME/.ivy2/cache/com.eed3si9n" || 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 -name "*.lock" -delete || true
sbt -v clean scripted
1 change: 0 additions & 1 deletion .java-version

This file was deleted.

9 changes: 7 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ ThisBuild / version := {

ThisBuild / organization := "com.eed3si9n"

def scala212 = "2.12.8"
def scala212 = "2.12.18"
ThisBuild / crossScalaVersions := Seq(scala212)
ThisBuild / scalaVersion := scala212

lazy val root = (project in file("."))
.enablePlugins(SbtPlugin, ContrabandPlugin)
.enablePlugins(SbtPlugin, ContrabandPlugin, SbtPlugin)
.settings(pomConsistency2021DraftSettings)
.settings(nocomma {
name := "sbt-assembly"
Expand All @@ -25,6 +25,11 @@ lazy val root = (project in file("."))
}
}
Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "scala"
scriptedLaunchOpts := { scriptedLaunchOpts.value ++
Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
}
scriptedBufferLog := false
scriptedSbt := "1.9.7"
})

ThisBuild / scmInfo := Some(
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.9.6
sbt.version=1.9.7
7 changes: 0 additions & 7 deletions scripted.sbt

This file was deleted.

This file was deleted.

0 comments on commit d262050

Please sign in to comment.