diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 636e534..8567e62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build Plazma on: push: - branches: [ "ver/*", "feat/*", "dev/*", "expr/*" ] + branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*" ] workflow_dispatch: env: diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml new file mode 100644 index 0000000..70b273f --- /dev/null +++ b/.github/workflows/check.yml @@ -0,0 +1,37 @@ +name: Test Gradle build script + +on: + push: + branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*" ] + workflow_dispatch: + +jobs: + release: + strategy: + matrix: + base_jdk: [19] + graal: [latest] + os: [ubuntu-22.04] + + runs-on: ${{ matrix.os }} + steps: + - name: Checkout action + uses: actions/checkout@v3 + + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 + + - name: Set up GraalVM ${{ matrix.jdk }} + uses: graalvm/setup-graalvm@v1 + with: + github-token: ${{ secrets.GH_PAT }} + java-version: ${{ matrix.base_jdk }} + version: ${{ matrix.graal }} + cache: 'gradle' + + - name: Configure Git + run: | + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]" + + - name: Run Gradle + run: ./gradlew --stacktrace diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 09651fd..4fb7b8d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: Test build with Normal JDK on: push: - branches: [ "ver/*", "feat/*", "dev/*", "expr/*" ] + branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*" ] workflow_dispatch: env: diff --git a/FixupAPI.sh b/FixupAPI.sh new file mode 100644 index 0000000..90bb0d7 --- /dev/null +++ b/FixupAPI.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# FixupAPI + +PS1="$" + +cd Plazma-API + +git add . +git commit -m "fixup" +git format-patch -1 + +cd ../ \ No newline at end of file diff --git a/FixupServer.sh b/FixupServer.sh new file mode 100644 index 0000000..28e7acd --- /dev/null +++ b/FixupServer.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# FixupServer + +PS1="$" + +cd Plazma-Server + +git add . +git commit -m "fixup" +git format-patch -1 + +cd ../ \ No newline at end of file diff --git a/scripts/fixupAPI.cmd b/scripts/fixupAPI.cmd deleted file mode 100644 index 37622d7..0000000 --- a/scripts/fixupAPI.cmd +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -cd Plazma-API >> NUL -git add . >> NUL -git commit -m "fixup" >> NUL -git format-patch -1 >> NUL -0001-fixup.patch >> NUL -cd .. >> NUL -echo Complete. diff --git a/scripts/fixupServer.cmd b/scripts/fixupServer.cmd deleted file mode 100644 index ff91364..0000000 --- a/scripts/fixupServer.cmd +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -cd Plazma-Server >> NUL -git add . >> NUL -git commit -m "fixup" >> NUL -git format-patch -1 >> NUL -0001-fixup.patch >> NUL -cd .. >> NUL -echo Complete. diff --git a/scripts/pull.cmd b/scripts/pull.cmd deleted file mode 100644 index 507975c..0000000 --- a/scripts/pull.cmd +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -git pull -taskkill /f /t /im java.exe >> NUL -taskkill /f /t /im git.exe >> NUL -rd /s /q Plazma-API >> NUL -rd /s /q Plazma-Server >> NUL -rd /s /q .gradle >> NUL -call gradlew.bat applyPatches diff --git a/scripts/reapply.cmd b/scripts/reapply.cmd deleted file mode 100644 index 8d93566..0000000 --- a/scripts/reapply.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -taskkill /f /t /im java.exe >> NUL -taskkill /f /t /im git.exe >> NUL -rd /s /q Plazma-API >> NUL -rd /s /q Plazma-Server >> NUL -rd /s /q .gradle >> NUL -call gradlew.bat applyPatches diff --git a/scripts/reapplyAPI.cmd b/scripts/reapplyAPI.cmd deleted file mode 100644 index 29a1995..0000000 --- a/scripts/reapplyAPI.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -taskkill /f /t /im java.exe >> NUL -taskkill /f /t /im git.exe >> NUL -rd /s /q Plazma-API >> NUL -call gradlew.bat applyAPIPatches diff --git a/scripts/reapplyServer.cmd b/scripts/reapplyServer.cmd deleted file mode 100644 index d515cf4..0000000 --- a/scripts/reapplyServer.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -taskkill /f /t /im java.exe >> NUL -taskkill /f /t /im git.exe >> NUL -rd /s /q Plazma-Server >> NUL -call gradlew.bat applyServerPatches