From 9ef5e7609e5dc155dc24c7570eb5332a6a48d768 Mon Sep 17 00:00:00 2001 From: Jakob Schulz <55949993+Lordikak@users.noreply.github.com> Date: Sun, 1 Nov 2026 16:07:31 +0100 Subject: [PATCH] Adapt CI for ViaAxiom --- .gitea/workflows/build.yml | 38 +++----------------------------------- steamwarci.yml | 35 +---------------------------------- 2 files changed, 4 insertions(+), 69 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 3044803..f2895f2 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - version/* jobs: build: @@ -13,21 +12,6 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v6 - - name: Setup Java 8 - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: 8 - - name: Setup Java 11 - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: 11 - - name: Setup Java 17 - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: 17 - name: Setup Java uses: actions/setup-java@v5 with: @@ -35,11 +19,6 @@ jobs: java-version: 21 - name: Setup Gradle uses: gradle/actions/setup-gradle@v6 - - name: Setup Maven Repository - env: - SW_MAVEN_CREDENTIALS: ${{ secrets.SW_MAVEN_CREDENTIALS }} - run: | - echo "$SW_MAVEN_CREDENTIALS" > steamwar.properties - name: Build with Gradle run: ./gradlew clean build --no-daemon --no-build-cache --refresh-dependencies @@ -51,7 +30,7 @@ jobs: rm -rf deploy mkdir -p deploy - cp "build/libs/ViaAxiom-all.jar" "deploy/ViaAxiom.jar" + cp velocity/build/libs/viaaxiom-velocity-*[0-9].jar deploy/ViaAxiom.jar - name: Upload deploy artifacts uses: actions/upload-artifact@v3 @@ -75,7 +54,7 @@ jobs: shell: bash run: | set -euo pipefail - echo "path=/jars/current" >> "$GITHUB_OUTPUT" + echo "path=/jars/viaaxiom" >> "$GITHUB_OUTPUT" - name: Upload jars with scp shell: bash @@ -106,15 +85,4 @@ jobs: ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "rm -f '$DEPLOY_PATH'/*.jar '$DEPLOY_PATH'/*.zip" ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mv '$DEPLOY_PATH'/upload/* '$DEPLOY_PATH'" ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "rm -r '$DEPLOY_PATH/upload'" - ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "chmod o-w '$DEPLOY_PATH'/*" - - name: Restart Services - shell: bash - env: - DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} - DEPLOY_USER: ${{ secrets.DEPLOY_USER }} - DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }} - DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }} - run: | - set -euo pipefail - - ssh -i ~/.ssh/deploy_key -p "$DEPLOY_PORT" "${DEPLOY_USER}@${DEPLOY_HOST}" "unzip -o /jars/current/sw.zip -d /jars" + ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "chmod o-w '$DEPLOY_PATH'/*" \ No newline at end of file diff --git a/steamwarci.yml b/steamwarci.yml index b971c05..6632a8b 100644 --- a/steamwarci.yml +++ b/steamwarci.yml @@ -2,37 +2,4 @@ build: - "./gradlew build --no-daemon" artifacts: - "/jars/BauSystem.jar": "BauSystem/build/libs/BauSystem-all.jar" - "/jars/BauSystem-1.12.jar": "LegacyBauSystem/build/libs/LegacyBauSystem.jar" - - "/jars/FightSystem.jar": "FightSystem/build/libs/FightSystem-all.jar" - #"/binarys/FightSystem_Standalone.jar": "FightSystem/FightSystem_Standalone/build/libs/FightSystem_Standalone-all.jar" - - "/jars/KotlinCore.jar": "KotlinCore/build/libs/KotlinCore-all.jar" - "/jars/TNTLeague.jar": "TNTLeague/build/libs/TNTLeague.jar" - - "/jars/LobbySystem.jar": "LobbySystem/build/libs/LobbySystem.jar" - - "/jars/MissileWars.jar": "MissileWars/build/libs/MissileWars.jar" - - "/jars/RealTime.jar": "Realtime/build/libs/Realtime.jar" - - "/jars/SchematicSystem.jar": "SchematicSystem/build/libs/SchematicSystem-all.jar" - - "/jars/SpigotCore.jar": "SpigotCore/build/libs/SpigotCore-all.jar" - - "/jars/Builder.jar": "Teamserver/build/libs/Teamserver.jar" - - "/jars/TowerRun.jar": "TowerRun/build/libs/TowerRun.jar" - - "/jars/PersistentVelocityCore.jar": "VelocityCore/Persistent/build/libs/Persistent.jar" - "/jars/DependenciesVelocityCore.jar": "VelocityCore/Dependencies/build/libs/Dependencies-all.jar" - "/jars/VelocityCore.jar": "VelocityCore/build/libs/VelocityCore-all.jar" - "/usr/local/bin/deployarena.py": "VelocityCore/deployarena.py" - - "/jars/website-api.jar": "WebsiteBackend/build/libs/WebsiteBackend-all.jar" - -release: - - "rm -rf /jars/sw" - - "unzip -o CLI/build/distributions/sw.zip -d /jars" - - "sudo systemctl restart api.service" + "/jars/viaaxiom/ViaAxiom.jar": "velocity/build/libs/viaaxiom-velocity-1.0.0.jar" \ No newline at end of file