Skip to content

Commit 5f274f3

Browse files
authored
Merge pull request #484 from ckipp01/setupJava
2 parents f7fad9e + ed16cb2 commit 5f274f3

File tree

5 files changed

+38
-14
lines changed

5 files changed

+38
-14
lines changed

.github/workflows/ci.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
java: [8, 17]
1717
steps:
1818
- uses: actions/checkout@v2
19-
- uses: actions/setup-java@v1
19+
- uses: actions/setup-java@v3
2020
with:
21+
distribution: 'temurin'
22+
cache: 'sbt'
2123
java-version: ${{ matrix.java }}
2224
- uses: actions/setup-go@v2
2325
with:
@@ -41,5 +43,9 @@ jobs:
4143
runs-on: ubuntu-latest
4244
steps:
4345
- uses: actions/checkout@v2
44-
- uses: olafurpg/setup-scala@v13
46+
- uses: actions/setup-java@v3
47+
with:
48+
distribution: 'temurin'
49+
java-version: 17
50+
cache: 'sbt'
4551
- run: sbt checkAll

.github/workflows/mdoc.yml

+5-1
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

+5-1
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

+5-1
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

+15-9
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)