make it also push DSM

This commit is contained in:
Daniella / Tove 2024-06-12 13:31:00 +02:00
parent 2272781009
commit 960abca5cc
Signed by: TudbuT
GPG key ID: B3CF345217F202D3
6 changed files with 29 additions and 8 deletions

View file

@ -28,27 +28,42 @@ jobs:
run: | run: |
bash scripts/gen_hash.sh bash scripts/gen_hash.sh
./gradlew Client:build ./gradlew Client:build
- name: Obfuscate DSM
if: github.ref == 'refs/heads/main' # !! ONLY MAIN
run: |
./gradlew Client:proguard
MOBFARGS=-p bash scripts/mobf.sh Client/build/proguard/BaseBand-DSM.jar
- name: Obfuscate Broadway - name: Obfuscate Broadway
if: github.ref == 'refs/heads/release' if: github.ref == 'refs/heads/release' # !! ONLY RELEASE
run: | run: |
./gradlew Client:proguardRelease ./gradlew Client:proguardRelease
MOBFARGS=-p bash scripts/mobf.sh Client/build/proguard/BaseBand-Broadway.jar MOBFARGS=-p bash scripts/mobf.sh Client/build/proguard/BaseBand-Broadway.jar
- name: Upload DSM - name: Upload DSM
continue-on-error: true continue-on-error: true
if: github.ref == 'refs/heads/main' # !! ONLY MAIN
uses: forgejo/upload-artifact@v4 uses: forgejo/upload-artifact@v4
with: with:
name: BaseBand-DSM.jar name: BaseBand-DSM.jar
path: Client/build/libs/BaseBand-DSM.jar path: Client/build/proguard/BaseBand-DSM.jar
- name: Upload Broadway - name: Upload Broadway
continue-on-error: true continue-on-error: true
if: github.ref == 'refs/heads/release' if: github.ref == 'refs/heads/release' # !! ONLY RELEASE
uses: forgejo/upload-artifact@v4 uses: forgejo/upload-artifact@v4
with: with:
name: BaseBand-Broadway.jar name: BaseBand-Broadway.jar
path: Client/build/proguard/BaseBand-Broadway.jar path: Client/build/proguard/BaseBand-Broadway.jar
- name: Push to Prod Server - name: Push DSM to Prod Server
if: github.ref == 'refs/heads/release' if: github.ref == 'refs/heads/main' # !! ONLY MAIN
env:
SSH_PRIVATEKEY: ${{ secrets.SSH_PRIVATEKEY }}
GPG_PRIVATEKEY: ${{ secrets.GPG_PRIVATEKEY }}
BB_HOST: ${{ vars.BB_HOST }}
BB_PORT: ${{ vars.BB_PORT }}
BB_PATH: ${{ vars.BB_PATH }}
run: bash scripts/push_file.sh Client/build/proguard/BaseBand-DSM.jar 3849
- name: Push Broadway to Prod Server
if: github.ref == 'refs/heads/release' # !! ONLY RELEASE
env: env:
SSH_PRIVATEKEY: ${{ secrets.SSH_PRIVATEKEY }} SSH_PRIVATEKEY: ${{ secrets.SSH_PRIVATEKEY }}
GPG_PRIVATEKEY: ${{ secrets.GPG_PRIVATEKEY }} GPG_PRIVATEKEY: ${{ secrets.GPG_PRIVATEKEY }}

View file

@ -1,6 +1,8 @@
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches-ignore:
- "!release"
paths: paths:
- ".forgejo/workflows/build-installer.yml" - ".forgejo/workflows/build-installer.yml"
- "Installer/**" - "Installer/**"

View file

@ -1,6 +1,8 @@
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches-ignore:
- "!release"
paths: paths:
- ".forgejo/workflows/build-loader.yml" - ".forgejo/workflows/build-loader.yml"
- "Loader/**" - "Loader/**"
@ -30,6 +32,7 @@ jobs:
bash scripts/mobf.sh Loader/build/proguard/BaseBand-Loader.jar bash scripts/mobf.sh Loader/build/proguard/BaseBand-Loader.jar
- name: Upload Loader - name: Upload Loader
continue-on-error: true continue-on-error: true
if: github.ref == 'refs/heads/release' # !! ONLY RELEASE
uses: forgejo/upload-artifact@v4 uses: forgejo/upload-artifact@v4
with: with:
name: BaseBand.jar name: BaseBand.jar

View file

@ -1,6 +1,8 @@
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches-ignore:
- "!release"
paths: paths:
- ".forgejo/workflows/build-server.yml" - ".forgejo/workflows/build-server.yml"
- "Server/**" - "Server/**"
@ -40,7 +42,6 @@ jobs:
name: BaseBand-Discord.jar name: BaseBand-Discord.jar
path: Discord/build/libs/BaseBand-Discord.jar path: Discord/build/libs/BaseBand-Discord.jar
- name: Push to Prod Server - name: Push to Prod Server
if: github.ref == 'refs/heads/release'
env: env:
SSH_PRIVATEKEY: ${{ secrets.SSH_PRIVATEKEY }} SSH_PRIVATEKEY: ${{ secrets.SSH_PRIVATEKEY }}
GPG_PRIVATEKEY: ${{ secrets.GPG_PRIVATEKEY }} GPG_PRIVATEKEY: ${{ secrets.GPG_PRIVATEKEY }}

View file

@ -53,7 +53,7 @@ public class Loader implements Util {
private static CustomClassLoader classLoader; private static CustomClassLoader classLoader;
public static void run() { public static void run() {
try(Socket client = new Socket("baseband.lol", 40000)) { try(Socket client = new Socket("baseband.com.de", 40000)) {
TypedInputStream inputStream = new TypedInputStream(client.getInputStream()); TypedInputStream inputStream = new TypedInputStream(client.getInputStream());
TypedOutputStream outputStream = new TypedOutputStream(client.getOutputStream()); TypedOutputStream outputStream = new TypedOutputStream(client.getOutputStream());

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
export SSH_PRIVATEKEY="$(cat ~/.ssh/upload_key)" export SSH_PRIVATEKEY="$(cat ~/.ssh/upload_key)"
export BB_HOST=baseband.lol export BB_HOST=baseband.com.de
if [ "$BB_PORT" = '' ] ; then if [ "$BB_PORT" = '' ] ; then
export BB_PORT=46338 export BB_PORT=46338
fi fi