Merge pull request #484 from ckipp01/setupJava

sourcegraph · Aug 16, 2022 · 5f274f3 · 5f274f3
2 parents f7fad9e + ed16cb2
commit 5f274f3
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,8 +16,10 @@ jobs:
         java: [8, 17]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
+          cache: 'sbt'
           java-version: ${{ matrix.java }}
       - uses: actions/setup-go@v2
         with:
@@ -41,5 +43,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
       - run: sbt checkAll
diff --git a/.github/workflows/mdoc.yml b/.github/workflows/mdoc.yml
@@ -10,7 +10,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 8
+          cache: 'sbt'
       - run: sbt docs/docusaurusPublishGhpages
         env:
           GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
@@ -9,7 +9,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 8
+          cache: 'sbt'
       - uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
         uses: docker/login-action@v1

diff --git a/.github/workflows/release-maven.yml b/.github/workflows/release-maven.yml
@@ -10,7 +10,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 8
+          cache: 'sbt'
       - name: Publish ${{ github.ref }}
         run: sbt ci-release
         env:

diff --git a/.github/workflows/sourcegraph.yml b/.github/workflows/sourcegraph.yml
@@ -3,24 +3,30 @@ on:
   push:
     branches:
       - main
-      - olafurpg/lets-go
-    pull_request:
+
+  pull_request:
+
 jobs:
   scip:
     runs-on: ubuntu-latest
     name: "Upload SCIP"
     steps:
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 8
+          cache: 'sbt'
+
       - uses: actions/setup-go@v2
         with:
           go-version: "1.15.6"
+
+      - name: Install src
+        run: yarn global add @sourcegraph/src
+
       - name: sbt sourcegraphUpload
-        run: |
-          mkdir -p bin
-          curl -L https://sourcegraph.com/.api/src-cli/src_linux_amd64 -o bin/src
-          chmod +x bin/src
-          export PATH="$PATH:$PWD/bin"
-          sbt sourcegraphUpload
+        run: sbt sourcegraphUpload
+
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}