Updating workflows to handle new build structure, removing maven workflows

This commit is contained in:
2026-04-08 13:38:46 -04:00
parent 2bff5c06c9
commit 7088dad4eb
5 changed files with 6 additions and 69 deletions
+3 -3
View File
@@ -17,13 +17,13 @@ jobs:
with:
gradle-version: 'wrapper'
- name: Build
run: gradle build --no-daemon
run: ./gradlew build --no-daemon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Version Number from Gradle
id: get_version
run: |
VERSION=$(gradle properties -q | awk -F': ' '/^version:/ {print $2; exit}')
VERSION=$(./gradlew properties -q | awk -F': ' '/^version:/ {print $2; exit}')
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
- name: Extract latest CHANGELOG entry
id: changelog
@@ -49,6 +49,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./Universal/build/libs/AntiVPN-${{ env.VERSION }}-universal.jar
asset_path: ./build/libs/AntiVPN-${{ env.VERSION }}-universal.jar
asset_name: AntiVPN-v${{ env.VERSION }}.jar
asset_content_type: application/java-archive
+2 -2
View File
@@ -22,14 +22,14 @@ jobs:
with:
gradle-version: 'wrapper'
- name: Build
run: gradle build --no-daemon
run: ./gradlew build --no-daemon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload AntiVPN
uses: actions/upload-artifact@v4
with:
name: AntiVPN-Universal
path: Universal/build/libs/AntiVPN-*-universal.jar
path: build/libs/AntiVPN-*-universal.jar
- name: Upload Sponge plugin
uses: actions/upload-artifact@v4
with:
-44
View File
@@ -1,44 +0,0 @@
on:
push:
branches: [master]
pull_request:
branches: [master]
workflow_dispatch:
jobs:
build:
name: Build and Test
runs-on: ubuntu-latest
steps:
- name: Cache local Maven repository
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/checkout@v5
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
java-version: '21'
distribution: 'zulu'
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.6
- name: Compile
run: mvn -B package --file pom.xml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload AntiVPN
uses: actions/upload-artifact@v4
with:
name: AntiVPN-Universal
path: Universal/target/AntiVPN-*.jar
- name: Upload Sponge plugin
uses: actions/upload-artifact@v4
with:
name: AntiVPN-Sponge
path: Sponge/target/Sponge-*.jar
+1 -1
View File
@@ -17,6 +17,6 @@ jobs:
with:
gradle-version: 'wrapper'
- name: Build
run: gradle build --no-daemon
run: ./gradlew build --no-daemon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-19
View File
@@ -1,19 +0,0 @@
on:
push:
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 21.0
distribution: 'zulu'
cache: 'maven'
- name: Compile
run: mvn -B package --file pom.xml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}