From 2dbadf5becf827ebe4d750a5889550d73b17417f Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Fri, 26 Aug 2022 14:59:25 +0200
Subject: [PATCH 1/2] chore(ci): cleanup CI to use setup-java and bump deps

This aligns CI a bit better with how it's being done in scip-java. It
also ensures actions/checkout is up to date and that the sourcegraph
upload is the newly recommended way of using the yarn installed `src`.

Supercedes #36
Relates to some CI changes in #51
Supercedes #56
---
 .github/workflows/ci.yml          | 16 ++++++++++++----
 .github/workflows/pr-auditor.yml  |  2 +-
 .github/workflows/release.yml     | 12 ++++++++----
 .github/workflows/sourcegraph.yml | 26 ++++++++++++++++----------
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e5d4cf..617c1c8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,12 +8,20 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          cache: "sbt"
+          java-version: 8
       - run: sbt scripted +test
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          cache: "sbt"
+          java-version: 8
       - run: sbt checkAll
diff --git a/.github/workflows/pr-auditor.yml b/.github/workflows/pr-auditor.yml
index 3fe4223..626ebc4 100644
--- a/.github/workflows/pr-auditor.yml
+++ b/.github/workflows/pr-auditor.yml
@@ -8,7 +8,7 @@ jobs:
   check-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with: { repository: 'sourcegraph/sourcegraph' }
       - uses: actions/setup-go@v2
         with: { go-version: '1.18' }
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3103752..a9a3cbd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,10 +7,14 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v13
-      - uses: olafurpg/setup-gpg@v3
-      - run: git fetch --unshallow
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - 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
index 6c6c626..03a643a 100644
--- a/.github/workflows/sourcegraph.yml
+++ b/.github/workflows/sourcegraph.yml
@@ -4,19 +4,25 @@ on:
     branches:
       - main
   pull_request:
+
 jobs:
-  lsif:
+  scip:
     runs-on: ubuntu-latest
-    name: "Upload LSIF"
+    name: "Upload SCIP"
     steps:
-      - uses: actions/checkout@v2
-      - uses: coursier/setup-action@v1.1.2
+      - uses: actions/checkout@v3
+      - uses: coursier/setup-action@v1
         with:
-          jvm: adopt:8
-      - run: |
-          cs launch com.sourcegraph:scip-java_2.13:latest.stable -M com.sourcegraph.scip_java.ScipJava -- index
-      - run: yarn global add @sourcegraph/src
-      - run: |
-          src code-intel upload "-commit=${GITHUB_SHA}" "-github-token=${GITHUB_TOKEN}"
+          jvm: 'temurin:8'
+          apps: scip-java
+
+      - name: Generate SCIP File
+        run: scip-java index
+
+      - name: Install src
+        run: yarn global add @sourcegraph/src
+
+      - name: Upload SCIP file
+        run: src code-intel upload -github-token $GITHUB_TOKEN
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 120aab80ec82c4eb38f08c04a5dc56fb4c6f542c Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Fri, 26 Aug 2022 15:08:36 +0200
Subject: [PATCH 2/2] chore: remove dependabot in favor of renovate

Right now you'll get actions prs from both dependabot and renovate
---
 .github/dependabot.yml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index e33811f..0000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 2
-updates:
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"