From e66bb7a14b5a97ff8c53043680210be244b7079b Mon Sep 17 00:00:00 2001 From: scorbett123 <50634068+scorbett123@users.noreply.github.com> Date: Sat, 12 Jun 2021 11:14:59 +0100 Subject: [PATCH 1/8] Make proguard output the mapping. --- scripts/proguard.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/proguard.pro b/scripts/proguard.pro index af920a59..ce92b30a 100644 --- a/scripts/proguard.pro +++ b/scripts/proguard.pro @@ -381,3 +381,5 @@ public java.lang.String substring(int); public java.lang.String substring(int,int); } + +-printmapping mapping.txt From 8f45718b758b3451b5079364c649b3bf285b93cf Mon Sep 17 00:00:00 2001 From: scorbett123 <50634068+scorbett123@users.noreply.github.com> Date: Sat, 12 Jun 2021 11:27:27 +0100 Subject: [PATCH 2/8] Try to create github actions An attempt at github actions. --- .github/workflows/gradle_build.yml | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/gradle_build.yml diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml new file mode 100644 index 00000000..4f537a1e --- /dev/null +++ b/.github/workflows/gradle_build.yml @@ -0,0 +1,39 @@ +# This workflow will build a Java project with Gradle +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + pull_request: + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Archive Artifacts + uses: actions/upload-artifact@v2 + with: + name: Artifacts + path: dist/ + + - name: Archive mapping.txt + uses: actions/upload-artifact@v2 + with: + name: Mappings + path: build/tmp/proguard/mapping.txt From 260989bda6e1778e4e62263f301916b54406c306 Mon Sep 17 00:00:00 2001 From: scorbett123 <50634068+scorbett123@users.noreply.github.com> Date: Sat, 12 Jun 2021 13:52:56 +0100 Subject: [PATCH 3/8] Update build java version for github actions. --- .github/workflows/gradle_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 4f537a1e..75708eef 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -17,7 +17,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: '11' + java-version: '8' distribution: 'adopt' - name: Grant execute permission for gradlew From 065470cecbbf7bf8805d93824cb0c2389c9bf624 Mon Sep 17 00:00:00 2001 From: scorbett123 <50634068+scorbett123@users.noreply.github.com> Date: Sat, 12 Jun 2021 14:02:31 +0100 Subject: [PATCH 4/8] update mapping.txt location --- .github/workflows/gradle_build.yml | 2 +- scripts/proguard.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 75708eef..60020c31 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -36,4 +36,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: Mappings - path: build/tmp/proguard/mapping.txt + path: dist/mapping.txt diff --git a/scripts/proguard.pro b/scripts/proguard.pro index ce92b30a..8ee6fec0 100644 --- a/scripts/proguard.pro +++ b/scripts/proguard.pro @@ -382,4 +382,4 @@ public java.lang.String substring(int,int); } --printmapping mapping.txt +-printmapping ../../../dist/mapping.txt From 6adc923bcb027f3fcd38c1615e92e0e98584c9f4 Mon Sep 17 00:00:00 2001 From: scorbett123 <50634068+scorbett123@users.noreply.github.com> Date: Sat, 12 Jun 2021 14:07:35 +0100 Subject: [PATCH 5/8] Revert "update mapping.txt location" This reverts commit 065470ce Github doesn't seem to support ../ --- .github/workflows/gradle_build.yml | 2 +- scripts/proguard.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 60020c31..75708eef 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -36,4 +36,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: Mappings - path: dist/mapping.txt + path: build/tmp/proguard/mapping.txt diff --git a/scripts/proguard.pro b/scripts/proguard.pro index 8ee6fec0..ce92b30a 100644 --- a/scripts/proguard.pro +++ b/scripts/proguard.pro @@ -382,4 +382,4 @@ public java.lang.String substring(int,int); } --printmapping ../../../dist/mapping.txt +-printmapping mapping.txt From 37e129bfb9a853dc5f0bb9f143d2fc8ba26fccb4 Mon Sep 17 00:00:00 2001 From: scorbett123 <50634068+scorbett123@users.noreply.github.com> Date: Sat, 12 Jun 2021 14:08:04 +0100 Subject: [PATCH 6/8] Create run_tests.yml --- .github/workflows/run_tests.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/workflows/run_tests.yml diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/.github/workflows/run_tests.yml @@ -0,0 +1 @@ + From cc488ccff0d50f4b7460fdbf5d52fdf1e14c5699 Mon Sep 17 00:00:00 2001 From: scorbett123 <50634068+scorbett123@users.noreply.github.com> Date: Sat, 12 Jun 2021 14:09:50 +0100 Subject: [PATCH 7/8] Make actions run tests as well. --- .github/workflows/run_tests.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 8b137891..4e28ed80 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -1 +1,26 @@ +name: Tests + +on: + push: + pull_request: + +jobs: + test: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 9 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew test + From 95910bc6cb816e4636c75be0fbd346e1ee578cd0 Mon Sep 17 00:00:00 2001 From: scorbett123 <50634068+scorbett123@users.noreply.github.com> Date: Sat, 12 Jun 2021 14:13:39 +0100 Subject: [PATCH 8/8] Cleanup - travis.org is now deprecated and can no longer be used. --- .github/workflows/gradle_build.yml | 2 +- .github/workflows/run_tests.yml | 2 +- .travis.yml | 28 ---------------------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 75708eef..34e93bff 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 8 uses: actions/setup-java@v2 with: java-version: '8' diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 4e28ed80..1af26a47 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -21,6 +21,6 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Build with Gradle + - name: Executing tests run: ./gradlew test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 75d14ffc..00000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -language: java - -sudo: required - -services: -- docker - -install: -- travis_retry docker build -t cabaletta/baritone . - -script: -- docker run --name baritone cabaletta/baritone ./gradlew javadoc -- docker cp baritone:/code/dist dist -- ls dist -- cat dist/checksums.txt - -deploy: - provider: releases - api_key: - secure: YOuiXoJNpB4bW89TQoY2IGXg0tqOKls55YMXsSPU6Mx8WzRu8CjjO/A8KA9nGfNrKM+NucjiKr/h53O2Dp2uyy0i0SLvav/G0MaBMeB1NlPRwFopi6tVPNaoZsvr8NW4BIURhspckYLpOTYWnfmOkIv8q7AxrjUZWPKDlq0dte20UxEqUE6msHJ7U9XlKo/4fX40kvWMfwGI2hTyAtL0cRT1QPsd+uW3OQjAPcQj+jKaWld46V8pBK8g9Qde9mo8HC9NBv97zw1bBF1EFkynW569kElHvaS2Opl2QLGaf66guDbpnqDpGHMhQrDdxsZHJ4RksyITn+8A9UArmbkU35BxKqBeQqOWxod2+M0axdLh1pvX43Q1t9n7RiZBf7GvV8vkXL5Sjf8v6Y4LqkJGhvQkTUwpH+0knwrE761DMCtBC34AiWG70D4u7msmhurkflr9kmRHSj/3lyJ1Q2lkt8L+FOAlQBVs64vXTsfgc6Yge7N0O3UD5hCkrDNoz3BzhNBdCkbdxdKCGip71UZgUNkPy9o3ui8jATNj9ypx3+U8ovqP0XWlJqUZmyeXyNGW9NrLeCkRLTlLnZ/dv6OPONa1oAu4TwF1w5A+TGRFZcZjH/PnZKZDQ1OYQOR6drLKRYdr2unvuf5KUKUGqZ7aYtLGhP0rBvGWddRV7DSmX/s= - all_branches: true - file_glob: true - file: - - dist/* - skip_cleanup: true - on: - tags: true - repo: cabaletta/baritone