Skip to content

Commit c44598a

Browse files
Clean-up CI jobs (#110)
1 parent 42f5623 commit c44598a

File tree

2 files changed

+12
-69
lines changed

2 files changed

+12
-69
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: CI
22
on:
33
push:
44
tags:
5-
- v1.*
6-
- v2.*
5+
- v*
76
branches:
87
- master
98
pull_request:
@@ -20,31 +19,29 @@ jobs:
2019
- uses: coursier/setup-action@v1.2.0-M3
2120
with:
2221
apps: scalafmt
23-
jvm: "graalvm-java17:21.3.0"
22+
jvm: "temurin:17"
2423
- name: Check formatting
2524
run: scalafmt --test
25+
2626
bridges:
2727
name: Test platform bridges
2828
runs-on: ${{ matrix.os }}
2929
strategy:
3030
fail-fast: false
3131
matrix:
3232
os: [ubuntu-latest, windows-latest, macOS-latest]
33-
jdk: ["graalvm-java17:21.3.0"]
3433
steps:
3534
- uses: actions/checkout@v3
3635
with:
3736
submodules: true
3837
fetch-depth: 0
3938
- uses: coursier/setup-action@v1.2.0-M3
4039
with:
41-
jvm: ${{ matrix.jdk }}
40+
jvm: "temurin:17"
4241
- name: Tests
4342
run: |
4443
.github/setup-test-projects.sh &&\
45-
sbt \
46-
"jsBridge1/publishLocal" \
47-
"jsBridge1/test"
44+
sbt "+jsBridge1/publishLocal" "+jsBridge1/test"
4845
shell: bash
4946

5047
test:
@@ -53,74 +50,39 @@ jobs:
5350
fail-fast: false
5451
matrix:
5552
os: [ubuntu-latest, windows-latest, macOS-latest]
56-
jdk: ["graalvm-java17:21.3.0", "temurin:17"]
57-
name: Test ${{ matrix.os }} -- ${{ matrix.jdk }}
58-
env:
59-
HYDRA_LICENSE: ${{ secrets.HYDRA_LICENSE }}
53+
name: Test
6054
steps:
6155
- uses: actions/checkout@v3
6256
with:
6357
submodules: true
6458
fetch-depth: 0
6559
- uses: coursier/setup-action@v1.2.0-M3
6660
with:
67-
jvm: ${{ matrix.jdk }}
68-
- name: Set up environment
69-
run: |
70-
curl -Lo coursier https://git.io/coursier-cli && chmod +x coursier && ./coursier --help
71-
yarn --help
72-
java -version
73-
[[ $HYDRA_LICENSE == floating-key=* ]] && mkdir -p $HOME/.triplequote && echo "$HYDRA_LICENSE" > "$HOME/.triplequote/hydra.license" || echo "Hydra license file was not created"
74-
shell: bash
61+
jvm: "temurin:17"
7562
- name: Compile and test main projects
7663
run: |
7764
.github/setup-test-projects.sh &&\
78-
sbt \
79-
"frontend/test:compile" \
80-
"backend/test" \
81-
"frontend/testOnly bloop.ScalaVersionsSpec" \
82-
"frontend/testOnly -bloop.ScalaVersionsSpec" &&\
83-
sbt \
84-
"+test:compile"
65+
sbt "+backend/test" "+frontend/test"
8566
shell: bash
8667

8768
release:
88-
name: Release version on ${{ matrix.os }}
89-
runs-on: ${{ matrix.os }}
69+
name: Release
70+
runs-on: ubuntu-latest
9071
if: github.event_name == 'push'
91-
strategy:
92-
fail-fast: true
93-
matrix:
94-
os: [ubuntu-latest]
95-
jdk: ["temurin:17"]
9672
env:
97-
CI: true
98-
SKIP_TEST_RESOURCES_GENERATION: true
9973
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
10074
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
10175
PGP_PASSWORD: ${{ secrets.PGP_PASSWORD }}
10276
PGP_PASSPHRASE: ${{ secrets.PGP_PASSWORD }}
103-
PGP_PUBLIC_KEY: ${{ secrets.PGP_PUBLIC_KEY }}
104-
PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }}
105-
GITHUB_DEPLOY_KEY: ${{ secrets.GITHUB_DEPLOY_KEY }}
106-
BLOOPOID_GITHUB_TOKEN: ${{ secrets.BLOOPOID_GITHUB_TOKEN }}
107-
BLOOPOID_SSH_PUBLIC_KEY: ${{ secrets.BLOOPOID_SSH_PUBLIC_KEY }}
108-
BLOOPOID_SSH_PRIVATE_KEY: ${{ secrets.BLOOPOID_SSH_PRIVATE_KEY }}
10977
steps:
11078
- uses: actions/checkout@v3
11179
with:
11280
submodules: true
11381
fetch-depth: 0
11482
- uses: coursier/setup-action@v1.2.0-M3
11583
with:
116-
jvm: ${{ matrix.jdk }}
117-
- name: Download built GraalVM binaries
118-
uses: actions/download-artifact@v3
119-
with:
120-
name: bloop-artifacts
121-
path: bloop-artifacts
122-
# - name: Publish docs and binaries to Maven Central
123-
- name: Cut GitHub release # and update installers on ${{ matrix.os }}
84+
jvm: "temurin:17"
85+
- name: Release
12486
run: sbt ci-release
12587
env:
12688
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

.github/workflows/sbt-dependency-graph.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)