Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade setup-scala to version 13 #76

Merged
merged 3 commits into from
Aug 12, 2021
Merged

Upgrade setup-scala to version 13 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a9f181
Upgrade setup-scala to version 13
vasilmkd Aug 11, 2021
fd565bc
Upgrade sbt to version 1.5.5
vasilmkd Aug 11, 2021
6942765
Merge branch 'main' into setup-scala-v13
djspiewak Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ThisBuild / githubWorkflowPublishTargetBranches :=
ThisBuild / githubWorkflowPublish := Seq()

sbtPlugin := true
sbtVersion := "1.5.4"
sbtVersion := "1.5.5"

publishMavenStyle := true

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.4
sbt.version=1.5.5
2 changes: 1 addition & 1 deletion src/main/scala/sbtghactions/WorkflowStep.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ object WorkflowStep {

val Checkout: WorkflowStep = Use(UseRef.Public("actions", "checkout", "v2"), name = Some("Checkout current branch (fast)"))

val SetupScala: WorkflowStep = Use(UseRef.Public("olafurpg", "setup-scala", "v12"), name = Some("Setup Java and Scala"), params = Map("java-version" -> s"$${{ matrix.java }}"))
val SetupScala: WorkflowStep = Use(UseRef.Public("olafurpg", "setup-scala", "v13"), name = Some("Setup Java and Scala"), params = Map("java-version" -> s"$${{ matrix.java }}"))

val Tmate: WorkflowStep = Use(UseRef.Public("mxschmitt", "action-tmate", "v2"), name = Some("Setup tmate session"))

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbtghactions/check-and-regenerate/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.4
sbt.version=1.5.5
4 changes: 2 additions & 2 deletions src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbtghactions/non-existent-target/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.4
sbt.version=1.5.5
4 changes: 2 additions & 2 deletions src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbtghactions/sbt-native-thin-client/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.4
sbt.version=1.5.5
4 changes: 2 additions & 2 deletions src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java }}

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbtghactions/suppressed-scala-version/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.4
sbt.version=1.5.5
10 changes: 5 additions & 5 deletions src/test/scala/sbtghactions/GenerativePluginSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ class GenerativePluginSpec extends Specification {
"compile use without parameters" in {
"public" >> {
compileStep(
Use(UseRef.Public("olafurpg", "setup-scala", "v12")),
"") mustEqual "- uses: olafurpg/setup-scala@v12"
Use(UseRef.Public("olafurpg", "setup-scala", "v13")),
"") mustEqual "- uses: olafurpg/setup-scala@v13"
}

"directory" >> {
Expand Down Expand Up @@ -358,8 +358,8 @@ class GenerativePluginSpec extends Specification {

"compile use with two parameters" in {
compileStep(
Use(UseRef.Public("olafurpg", "setup-scala", "v12"), params = Map("abc" -> "def", "cafe" -> "@42")),
"") mustEqual "- uses: olafurpg/setup-scala@v12\n with:\n abc: def\n cafe: '@42'"
Use(UseRef.Public("olafurpg", "setup-scala", "v13"), params = Map("abc" -> "def", "cafe" -> "@42")),
"") mustEqual "- uses: olafurpg/setup-scala@v13\n with:\n abc: def\n cafe: '@42'"
}

"compile use with two parameters and environment variables" in {
Expand Down Expand Up @@ -455,7 +455,7 @@ class GenerativePluginSpec extends Specification {
runs-on: $${{ matrix.os }}
steps:
- name: Setup Java and Scala
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: $${{ matrix.java }}"""
}
Expand Down