From d34575bb6b9972160354e7a7f79f634e371ca0e8 Mon Sep 17 00:00:00 2001 From: OtterDev <134523836+OtterCodes101@users.noreply.github.com> Date: Mon, 31 Jul 2023 10:29:41 -0600 Subject: [PATCH 1/8] add Github action --- .github/workflows/build.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b04c922 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,15 @@ +name: Build with Gradle + +on: + push: + +jobs: + build-gradle-project: + runs-on: ubuntu-latest + steps: + - name: Checkout project sources + uses: actions/checkout@v3 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Run build with Gradle Wrapper + run: ./gradlew teavm From a7a7814a1cf3e7b534951be728590039f757f9e6 Mon Sep 17 00:00:00 2001 From: OtterDev <134523836+OtterCodes101@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:46:32 +0000 Subject: [PATCH 2/8] make it export the epk as resources.mc --- lax1dude/epkcompiler/run.bat | 2 +- lax1dude/epkcompiler/run_unix.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lax1dude/epkcompiler/run.bat b/lax1dude/epkcompiler/run.bat index d853ac5..6e22bd5 100755 --- a/lax1dude/epkcompiler/run.bat +++ b/lax1dude/epkcompiler/run.bat @@ -1,2 +1,2 @@ @echo off -java -jar CompilePackage.jar "../../resources" "../../js/resources.epk" \ No newline at end of file +java -jar CompilePackage.jar "../../resources" "../../js/resources.mc" \ No newline at end of file diff --git a/lax1dude/epkcompiler/run_unix.sh b/lax1dude/epkcompiler/run_unix.sh index cf13f33..41e2dbc 100755 --- a/lax1dude/epkcompiler/run_unix.sh +++ b/lax1dude/epkcompiler/run_unix.sh @@ -1,2 +1,2 @@ #!/bin/sh -java -jar CompilePackage.jar "../../resources" "../../js/resources.epk" \ No newline at end of file +java -jar CompilePackage.jar "../../resources" "../../js/resources.mc" \ No newline at end of file From 3794a356d259d4dc44274dd1b071c4b42646abe5 Mon Sep 17 00:00:00 2001 From: OtterDev <134523836+OtterCodes101@users.noreply.github.com> Date: Mon, 31 Jul 2023 10:53:16 -0600 Subject: [PATCH 3/8] Export build and epk file to github actions --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b04c922..a89e1e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,3 +13,12 @@ jobs: uses: gradle/gradle-build-action@v2 - name: Run build with Gradle Wrapper run: ./gradlew teavm + - name: Setup Java JDK + uses: actions/setup-java@v3.12.0 + - name: Compile EPK + run: bash lax1dude/epkcompiler/run_unix.sh + - name: Export data + uses: actions/upload-artifact@v3 + with: + name: web + path: js/* From 56f4ad42da0b3cba7d45c2d46235dbbcc30e4900 Mon Sep 17 00:00:00 2001 From: OtterDev <134523836+OtterCodes101@users.noreply.github.com> Date: Mon, 31 Jul 2023 10:55:49 -0600 Subject: [PATCH 4/8] whoops, almost forgot about that --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a89e1e4..7afe071 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,8 @@ jobs: run: ./gradlew teavm - name: Setup Java JDK uses: actions/setup-java@v3.12.0 + with: + distribution: jdk - name: Compile EPK run: bash lax1dude/epkcompiler/run_unix.sh - name: Export data From 9dbb50754e97ae7ae4335c1cfd9138b657b4b4da Mon Sep 17 00:00:00 2001 From: OtterDev <134523836+OtterCodes101@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:00:03 -0600 Subject: [PATCH 5/8] Fix the github action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7afe071..fcaf1c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Java JDK uses: actions/setup-java@v3.12.0 with: - distribution: jdk + distribution: adopt - name: Compile EPK run: bash lax1dude/epkcompiler/run_unix.sh - name: Export data From 6970f8a44b51e963ff1f09e69907993d7f19bdf1 Mon Sep 17 00:00:00 2001 From: OtterDev <134523836+OtterCodes101@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:02:43 -0600 Subject: [PATCH 6/8] should finally work --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fcaf1c9..78371e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,8 @@ jobs: - name: Setup Java JDK uses: actions/setup-java@v3.12.0 with: - distribution: adopt + distribution: 'adopt' + java-version: '17' - name: Compile EPK run: bash lax1dude/epkcompiler/run_unix.sh - name: Export data From 0eb827ac03e167a6d8e0cbffa858ae5970fb9185 Mon Sep 17 00:00:00 2001 From: OtterDev <134523836+OtterCodes101@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:05:19 -0600 Subject: [PATCH 7/8] fix problem in running action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78371e7..2a21ed7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: distribution: 'adopt' java-version: '17' - name: Compile EPK - run: bash lax1dude/epkcompiler/run_unix.sh + run: java -jar lax1dude/epkcompiler/CompilePackage.jar "../../resources" "../../js/resources.mc" - name: Export data uses: actions/upload-artifact@v3 with: From fbe46e28530ed48a3651d4ba6ce12ee999a458e0 Mon Sep 17 00:00:00 2001 From: OtterDev <134523836+OtterCodes101@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:08:01 -0600 Subject: [PATCH 8/8] remove nonfunctional step from the action --- .github/workflows/build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a21ed7..e8c0b9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,13 +13,6 @@ jobs: uses: gradle/gradle-build-action@v2 - name: Run build with Gradle Wrapper run: ./gradlew teavm - - name: Setup Java JDK - uses: actions/setup-java@v3.12.0 - with: - distribution: 'adopt' - java-version: '17' - - name: Compile EPK - run: java -jar lax1dude/epkcompiler/CompilePackage.jar "../../resources" "../../js/resources.mc" - name: Export data uses: actions/upload-artifact@v3 with: