Skip to content

Commit 313e777

Browse files
committed
chore(ci): align usage of setup-java
I saw in one place this was using setup-java but the rest setup-scala. Another opinionated change, but since setup-java also has the default sbt launcher and built-in sbt caching I think it's a better choice to just use that unless it's being included for another reason. This also makes a small change on the sourcegraph upload to use the npm installed src instead of curling it down manually.
1 parent 22e8f03 commit 313e777

File tree

5 files changed

+38
-14
lines changed

5 files changed

+38
-14
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
os: [ubuntu-latest]
1515
steps:
1616
- uses: actions/checkout@v2
17-
- uses: actions/setup-java@v1
17+
- uses: actions/setup-java@v3
1818
with:
19+
distribution: 'temurin'
1920
java-version: 8
21+
cache: 'sbt'
2022
- uses: actions/setup-go@v2
2123
with:
2224
go-version: "^1.13.1"
@@ -39,5 +41,9 @@ jobs:
3941
runs-on: ubuntu-latest
4042
steps:
4143
- uses: actions/checkout@v2
42-
- uses: olafurpg/setup-scala@v13
44+
- uses: actions/setup-java@v3
45+
with:
46+
distribution: 'temurin'
47+
java-version: 17
48+
cache: 'sbt'
4349
- run: sbt checkAll

.github/workflows/mdoc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ jobs:
1010
- uses: actions/checkout@v2
1111
with:
1212
fetch-depth: 0
13-
- uses: olafurpg/setup-scala@v13
13+
- uses: actions/setup-java@v3
14+
with:
15+
distribution: 'temurin'
16+
java-version: 8
17+
cache: 'sbt'
1418
- run: sbt docs/docusaurusPublishGhpages
1519
env:
1620
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}

.github/workflows/release-docker.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ jobs:
99
- uses: actions/checkout@v2
1010
with:
1111
fetch-depth: 0
12-
- uses: olafurpg/setup-scala@v13
12+
- uses: actions/setup-java@v3
13+
with:
14+
distribution: 'temurin'
15+
java-version: 8
16+
cache: 'sbt'
1317
- uses: docker/setup-buildx-action@v1
1418
- name: Login to DockerHub
1519
uses: docker/login-action@v1

.github/workflows/release-maven.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ jobs:
1010
- uses: actions/checkout@v2
1111
with:
1212
fetch-depth: 0
13-
- uses: olafurpg/setup-scala@v13
13+
- uses: actions/setup-java@v3
14+
with:
15+
distribution: 'temurin'
16+
java-version: 8
17+
cache: 'sbt'
1418
- name: Publish ${{ github.ref }}
1519
run: sbt ci-release
1620
env:

.github/workflows/sourcegraph.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,30 @@ on:
33
push:
44
branches:
55
- main
6-
- olafurpg/lets-go
7-
pull_request:
6+
7+
pull_request:
8+
89
jobs:
910
scip:
1011
runs-on: ubuntu-latest
1112
name: "Upload SCIP"
1213
steps:
1314
- uses: actions/checkout@v2
14-
- uses: olafurpg/setup-scala@v13
15+
- uses: actions/setup-java@v3
16+
with:
17+
distribution: 'temurin'
18+
java-version: 8
19+
cache: 'sbt'
20+
1521
- uses: actions/setup-go@v2
1622
with:
1723
go-version: "1.15.6"
24+
25+
- name: Install src
26+
run: yarn global add @sourcegraph/src
27+
1828
- name: sbt sourcegraphUpload
19-
run: |
20-
mkdir -p bin
21-
curl -L https://sourcegraph.com/.api/src-cli/src_linux_amd64 -o bin/src
22-
chmod +x bin/src
23-
export PATH="$PATH:$PWD/bin"
24-
sbt sourcegraphUpload
29+
run: sbt sourcegraphUpload
30+
2531
env:
2632
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)