From de023486cc464bed1434c92933d4bc973e6b6059 Mon Sep 17 00:00:00 2001
From: Ike Johnson-Woods <contact@ike.au>
Date: Wed, 16 Aug 2023 18:39:45 +0800
Subject: [PATCH] Fix up CI

---
 .github/workflows/maven.yml   |  6 ++---
 .github/workflows/release.yml | 43 -----------------------------------
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d7e1261..4b6cad3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,4 +1,4 @@
-name: Push & Pull Request CI
+name: Maven CI
 
 on:
   push:
@@ -23,11 +23,11 @@ jobs:
 
     - name: Locate built JARfile
       id: jar
-      run: echo "jarfile=$(find build/libs/ -name "keycloak-discord-*.jar" -not -name "*slim*" -not -name "*source*")" >> $GITHUB_OUTPUT
+      run: echo "jarfile=$(find target/ -name "keycloak-discord-*.jar" -not -name "*slim*" -not -name "*source*")" >> $GITHUB_OUTPUT
 
     - name: Set Artifact name
       id: jarname
-      run: echo "jarname=$(find build/libs/ -name "keycloak-discord-*.jar" -not -name "*slim*" -not -name "*source*" | sed 's:.*/::')" >> $GITHUB_OUTPUT
+      run: echo "jarname=$(find target/ -name "keycloak-discord-*.jar" -not -name "*slim*" -not -name "*source*" | sed 's:.*/::')" >> $GITHUB_OUTPUT
 
     - name: Upload artifact
       uses: actions/upload-artifact@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index b5d1edc..0000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Release CI
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: Build and release
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Setup node 10
-      uses: actions/setup-node@v1
-      with:
-        node-version: '10.x'
-    - name: Cache for maven
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
-    - name: Cache for npm
-      uses: actions/cache@v1
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('.github/workflows/release.yml') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-    - name: Setup semantic-release
-      run: npm install -g @conveyal/maven-semantic-release@v4.5.0 semantic-release@15 @semantic-release/exec@v3.3.8
-    - name: Release
-      run: semantic-release --branch master --use-conveyal-workflow --skip-maven-deploy
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-