From b72baefd539842519bf3ea848dd0df3875c8694b Mon Sep 17 00:00:00 2001 From: TudbuT Date: Wed, 12 Jun 2024 09:49:58 +0200 Subject: [PATCH] move scripts --- .forgejo/workflows/build-client.yml | 8 +++---- .forgejo/workflows/build-installer.yml | 6 +++--- .forgejo/workflows/build-loader.yml | 8 +++---- .forgejo/workflows/build-server.yml | 8 +++---- .run/mobf.run.xml | 19 ++--------------- .run/push_local.run.xml | 21 +++---------------- mobf.sh => scripts/mobf.sh | 0 push_file.sh => scripts/push_file.sh | 0 push_file.sh.old => scripts/push_file.sh.old | 0 push_local.sh => scripts/push_local.sh | 6 +++--- .../trigger-rebuild.sh | 0 webhook.sh => scripts/webhook.sh | 0 12 files changed, 23 insertions(+), 53 deletions(-) rename mobf.sh => scripts/mobf.sh (100%) rename push_file.sh => scripts/push_file.sh (100%) rename push_file.sh.old => scripts/push_file.sh.old (100%) rename push_local.sh => scripts/push_local.sh (52%) rename trigger-rebuild.sh => scripts/trigger-rebuild.sh (100%) rename webhook.sh => scripts/webhook.sh (100%) diff --git a/.forgejo/workflows/build-client.yml b/.forgejo/workflows/build-client.yml index c9e6c26..494a5ef 100644 --- a/.forgejo/workflows/build-client.yml +++ b/.forgejo/workflows/build-client.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Notify Action Start - run: bash webhook.sh "**(Client)** Build Action Started at" + run: bash scripts/webhook.sh "**(Client)** Build Action Started at" - name: Initialize Gradle uses: https://github.com/gradle/actions/setup-gradle@v3 - name: Build @@ -30,7 +30,7 @@ jobs: if: github.ref == 'refs/heads/release' run: | ./gradlew Client:proguardRelease - MOBFARGS=-p bash mobf.sh Client/build/proguard/BaseBand-Broadway.jar + MOBFARGS=-p bash scripts/mobf.sh Client/build/proguard/BaseBand-Broadway.jar - name: Upload DSM continue-on-error: true @@ -53,7 +53,7 @@ jobs: BB_HOST: ${{ vars.BB_HOST }} BB_PORT: ${{ vars.BB_PORT }} BB_PATH: ${{ vars.BB_PATH }} - run: bash push_file.sh Client/build/proguard/BaseBand-Broadway.jar 3849 + run: bash scripts/push_file.sh Client/build/proguard/BaseBand-Broadway.jar 3849 - name: Notify Action Completion - run: bash webhook.sh "**(Client)** Build Action Completed at" + run: bash scripts/webhook.sh "**(Client)** Build Action Completed at" diff --git a/.forgejo/workflows/build-installer.yml b/.forgejo/workflows/build-installer.yml index 643d6f9..5ff4ff0 100644 --- a/.forgejo/workflows/build-installer.yml +++ b/.forgejo/workflows/build-installer.yml @@ -21,13 +21,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Notify Action Start - run: bash webhook.sh "**(Installer)** Build Action Started at" + run: bash scripts/webhook.sh "**(Installer)** Build Action Started at" - name: Initialize Gradle uses: https://github.com/gradle/actions/setup-gradle@v3 - name: Build run: | ./gradlew --no-daemon Installer:build - bash mobf.sh Installer/build/libs/BaseBand-Installer.jar + bash scripts/mobf.sh Installer/build/libs/BaseBand-Installer.jar - name: Upload Installer continue-on-error: true uses: forgejo/upload-artifact@v4 @@ -35,4 +35,4 @@ jobs: name: BaseBand-Installer.jar path: Installer/build/libs/BaseBand-Installer.jar - name: Notify Action Completion - run: bash webhook.sh "**(Installer)** Build Action Completed at" \ No newline at end of file + run: bash scripts/webhook.sh "**(Installer)** Build Action Completed at" \ No newline at end of file diff --git a/.forgejo/workflows/build-loader.yml b/.forgejo/workflows/build-loader.yml index 45166a4..9a9e1d0 100644 --- a/.forgejo/workflows/build-loader.yml +++ b/.forgejo/workflows/build-loader.yml @@ -21,13 +21,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Notify Action Start - run: bash webhook.sh "**(Loader)** Build Action Started at" + run: bash scripts/webhook.sh "**(Loader)** Build Action Started at" - name: Initialize Gradle uses: https://github.com/gradle/actions/setup-gradle@v3 - name: Build run: | ./gradlew --no-daemon Loader:build Loader:proguard - bash mobf.sh Loader/build/proguard/BaseBand-Loader.jar + bash scripts/mobf.sh Loader/build/proguard/BaseBand-Loader.jar - name: Upload Loader continue-on-error: true uses: forgejo/upload-artifact@v4 @@ -42,6 +42,6 @@ jobs: BB_HOST: ${{ vars.BB_HOST }} BB_PORT: ${{ vars.BB_PORT }} BB_PATH: ${{ vars.BB_PATH }} - run: bash push_file.sh Loader/build/proguard/BaseBand-Loader.jar 3848 + run: bash scripts/push_file.sh Loader/build/proguard/BaseBand-Loader.jar 3848 - name: Notify Action Completion - run: bash webhook.sh "**(Loader)** Build Action Completed at" + run: bash scripts/webhook.sh "**(Loader)** Build Action Completed at" diff --git a/.forgejo/workflows/build-server.yml b/.forgejo/workflows/build-server.yml index 07a1f8d..9989f1a 100644 --- a/.forgejo/workflows/build-server.yml +++ b/.forgejo/workflows/build-server.yml @@ -22,7 +22,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Notify Action Start - run: bash webhook.sh "**(Server)** Build Action Started at" + run: bash scripts/webhook.sh "**(Server)** Build Action Started at" - name: Initialize Gradle uses: https://github.com/gradle/actions/setup-gradle@v3 - name: Build @@ -48,7 +48,7 @@ jobs: BB_PORT: ${{ vars.BB_PORT }} BB_PATH: ${{ vars.BB_PATH }} run: | - bash push_file.sh Server/build/libs/BaseBand-Server.jar - bash push_file.sh Discord/build/libs/BaseBand-Discord.jar + bash scripts/push_file.sh Server/build/libs/BaseBand-Server.jar + bash scripts/push_file.sh Discord/build/libs/BaseBand-Discord.jar - name: Notify Action Completion - run: bash webhook.sh "**(Server)** Build Action Completed at" + run: bash scripts/webhook.sh "**(Server)** Build Action Completed at" diff --git a/.run/mobf.run.xml b/.run/mobf.run.xml index 39334ea..e4516ab 100644 --- a/.run/mobf.run.xml +++ b/.run/mobf.run.xml @@ -1,23 +1,8 @@ - - -