Skip to content

Commit

Permalink
Run sbt githubWorkflowGenerate
Browse files Browse the repository at this point in the history
  • Loading branch information
nafg committed Sep 27, 2024
1 parent abc8cc8 commit b9efee1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,25 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.13.14, 3.3.3]
java: [temurin@8]
java: [zulu@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
- name: Setup Java (zulu@8)
if: matrix.java == 'zulu@8'
uses: actions/setup-java@v4
with:
distribution: temurin
distribution: zulu
java-version: 8
cache: sbt

- name: Setup sbt
uses: sbt/setup-sbt@v1

- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down Expand Up @@ -67,22 +70,25 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [3.3.3]
java: [temurin@8]
java: [zulu@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
- name: Setup Java (zulu@8)
if: matrix.java == 'zulu@8'
uses: actions/setup-java@v4
with:
distribution: temurin
distribution: zulu
java-version: 8
cache: sbt

- name: Setup sbt
uses: sbt/setup-sbt@v1

- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down
6 changes: 3 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
defaults: {}
queue_rules:
- name: default
conditions: []
merge_conditions: []
pull_request_rules:
- name: Automatically merge successful Scala Steward PRs
conditions:
- or:
- author=scala-steward
- author=nafg-scala-steward[bot]
- check-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8)
- check-success=Build and Test (ubuntu-latest, 3.3.3, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.13.14, zulu@8)
- check-success=Build and Test (ubuntu-latest, 3.3.3, zulu@8)
actions:
queue:
name: default

0 comments on commit b9efee1

Please sign in to comment.