mirror of
https://github.com/funkemunky/AntiVPN.git
synced 2026-07-01 07:48:28 +00:00
Merge branch 'master' into 57-feature-allow-subnets-to-be-whitelisted
# Conflicts: # Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java # Bukkit/pom.xml # Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java # Bungee/pom.xml # Common/Source/src/main/java/dev/brighten/antivpn/database/Database.java # Common/Source/src/main/java/dev/brighten/antivpn/database/VPNDatabase.java # Common/Source/src/main/java/dev/brighten/antivpn/database/local/H2VPN.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongo/MongoVPN.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/MongoDatabase.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/records/AlertsUser.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/records/CidrWhitelist.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/records/UserIpResponse.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/records/UserWhitelist.java # Common/Source/src/main/java/dev/brighten/antivpn/database/postgres/PostgresDatabase.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/ExecutableStatement.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/NonClosableConnection.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/Query.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/ResultSetIterator.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sqllite/LiteDatabase.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sqllite/version/Version.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sqllite/version/impl/First.java # Common/Source/src/main/java/dev/brighten/antivpn/utils/CIDRUtils.java # Common/Source/src/main/java/dev/brighten/antivpn/utils/IpUtils.java # Common/pom.xml # Sponge/pom.xml # Universal/pom.xml # Velocity/VelocityPlugin/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java # Velocity/VelocityPlugin/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java # Velocity/pom.xml # pom.xml
This commit is contained in:
@@ -0,0 +1,67 @@
|
||||
name: create-release.yml
|
||||
on:
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
build-and-release:
|
||||
name: Build and Release
|
||||
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: Get Version Number from Pom
|
||||
id: get_version
|
||||
run: echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
|
||||
- name: Extract latest CHANGELOG entry
|
||||
id: changelog
|
||||
run: |
|
||||
CHANGELOG_CONTENT=$(awk 'BEGIN {print_section=0;} /^## \[/ {if (print_section == 0) {print_section=1;} else {exit;}} print_section {print;}' CHANGELOG.md)
|
||||
CHANGELOG_ESCAPED=$(echo "$CHANGELOG_CONTENT" | sed ':a;N;$!ba;s/\n/%0A/g')
|
||||
echo "Extracted latest release notes from CHANGELOG.md:"
|
||||
echo -e "$CHANGELOG_CONTENT"
|
||||
echo "::set-output name=content::$CHANGELOG_ESCAPED"
|
||||
- name: Create Release
|
||||
uses: actions/create-release@v1
|
||||
id: create_release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: v${{ env.VERSION }}
|
||||
release_name: Release v${{ env.VERSION }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
body: ${{ steps.changelog.outputs.content }}
|
||||
- uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./Universal/target/AntiVPN-${{ env.VERSION }}-universal.jar
|
||||
asset_name: AntiVPN-Universal-v${{ env.VERSION }}.jar
|
||||
asset_content_type: application/java-archive
|
||||
- uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./Sponge/target/Sponge-${{ env.VERSION }}.jar
|
||||
asset_name: AntiVPN-Sponge-v${{ env.VERSION }}.jar
|
||||
asset_content_type: application/java-archive
|
||||
@@ -12,15 +12,15 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Cache local Maven repository
|
||||
uses: actions/cache@v3
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.m2/repository
|
||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-maven-
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v4
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: '21'
|
||||
distribution: 'zulu'
|
||||
|
||||
Reference in New Issue
Block a user