Skip to content

Commit

Permalink
Merge pull request #339 from scala-steward/update/sbt-lucuma-lib-0.6.3
Browse files Browse the repository at this point in the history
Update sbt-lucuma-lib to 0.6.3
  • Loading branch information
rpiaggio authored Mar 10, 2022
2 parents 7d27c60 + c0547e1 commit 805e98f
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 13 deletions.
44 changes: 40 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,37 @@ jobs:
with:
fetch-depth: 0

- name: Download Java (temurin@11)
id: download-java-temurin-11
if: matrix.java == 'temurin@11'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 11

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
with:
distribution: temurin
distribution: jdkfile
java-version: 11
jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}

- name: Download Java (temurin@17)
id: download-java-temurin-17
if: matrix.java == 'temurin@17'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 17

- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: temurin
distribution: jdkfile
java-version: 17
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}

- name: Cache sbt
uses: actions/cache@v2
Expand Down Expand Up @@ -111,19 +129,37 @@ jobs:
with:
fetch-depth: 0

- name: Download Java (temurin@11)
id: download-java-temurin-11
if: matrix.java == 'temurin@11'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 11

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
with:
distribution: temurin
distribution: jdkfile
java-version: 11
jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}

- name: Download Java (temurin@17)
id: download-java-temurin-17
if: matrix.java == 'temurin@17'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 17

- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: temurin
distribution: jdkfile
java-version: 17
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}

- name: Cache sbt
uses: actions/cache@v2
Expand Down
33 changes: 25 additions & 8 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
# This file was automatically generated by sbt-typelevel-mergify using the
# mergifyGenerate task. You should add and commit this file to
# your git repository. It goes without saying that you shouldn't edit
# this file by hand! Instead, if you wish to make changes, you should
# change your sbt build configuration to revise the mergify configuration
# to meet your needs, then regenerate this file.

pull_request_rules:
- name: automatically merge scala-steward's PRs
conditions:
- author=scala-steward
- body~=labels:.*semver-patch.*
- status-success=build
actions:
merge:
method: merge
- name: merge scala-steward's PRs
conditions:
- author=scala-steward
- or:
- body~=labels:.*early-semver-patch
- body~=labels:.*early-semver-minor
- status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@11, rootJS)
- status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@11, rootJVM)
- status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@17, rootJVM)
actions:
merge: {}
- name: Label genTestsAggregate PRs
conditions:
- files~=^target/genTestsAggregate/
actions:
label:
add:
- genTestsAggregate
remove: []
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.6.0")
addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.6.3")
addSbtPlugin(("ch.epfl.scala" % "sbt-scalafix" % "0.9.33").cross(CrossVersion.for3Use2_13))
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0")

0 comments on commit 805e98f

Please sign in to comment.