Skip to content

Commit 25bb21a

Browse files
authored
Update ci.yml
1 parent 1011431 commit 25bb21a

File tree

1 file changed

+9
-30
lines changed

1 file changed

+9
-30
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,18 @@ jobs:
3434
- uses: actions/checkout@v3.6.0
3535
with:
3636
fetch-depth: 0
37-
- uses: olafurpg/setup-scala@v14
37+
- uses: actions/setup-java@v3
3838
with:
39-
java-version: "adopt@1.8"
40-
- uses: coursier/cache-action@v6
39+
distribution: 'temurin'
40+
java-version: '11'
41+
cache: 'sbt'
4142
- run: sbt -v lint
42-
- name: clean up
43-
run: "${GITHUB_WORKSPACE}/.github/clean-up.sh"
4443
test:
4544
strategy:
4645
fail-fast: false
4746
matrix:
48-
jdk: [ adopt@1.8, adopt@1.11, adopt@1.14 ]
49-
scala: [ 2.13.11, 2.12.17, 3.1.3 ]
47+
jdk: [ 11, 17, 19 ]
48+
scala: [ 2.13.12, 3.3.1 ]
5049
runs-on: ubuntu-latest
5150
needs: lint
5251
env:
@@ -58,30 +57,10 @@ jobs:
5857
- uses: actions/checkout@v3.6.0
5958
with:
6059
fetch-depth: 0
61-
- uses: olafurpg/setup-scala@v14
60+
- uses: actions/setup-java@v3
6261
with:
62+
distribution: 'temurin'
6363
java-version: ${{ matrix.jdk }}
64-
- uses: coursier/cache-action@v6
64+
cache: 'sbt'
6565
- name: sbt test
6666
run: sbt -v ++${{ matrix.scala }} test
67-
- name: clean up
68-
run: "${GITHUB_WORKSPACE}/.github/clean-up.sh"
69-
automerge:
70-
runs-on: ubuntu-latest
71-
if: github.event_name == 'pull_request' && github.actor == 'j5ik2o-bot[bot]'
72-
needs: test
73-
steps:
74-
- name: Generate token
75-
id: generate_token
76-
uses: tibdex/github-app-token@v1
77-
with:
78-
app_id: 111016
79-
private_key: ${{ secrets.BOT_PRIVATE_KEY }}
80-
- name: automerge
81-
uses: pascalgn/automerge-action@v0.15.6
82-
env:
83-
GITHUB_TOKEN: "${{ steps.generate_token.outputs.token }}"
84-
MERGE_LABELS: ""
85-
MERGE_METHOD: "rebase"
86-
MERGE_FILTER_AUTHOR: "j5ik2o-bot[bot]"
87-
MERGE_DELETE_BRANCH: "true"

0 commit comments

Comments
 (0)