-
Notifications
You must be signed in to change notification settings - Fork 571
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6103 from kevlahnota/master2
Update Android build (SDK 35), Java 17, LibGDX 1.13.0
- Loading branch information
Showing
192 changed files
with
2,744 additions
and
1,832 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,10 +23,10 @@ jobs: | |
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Set up JDK 11 | ||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: '11' | ||
| java-version: '17' | ||
| distribution: 'temurin' | ||
| cache: 'maven' | ||
| server-id: cardforge-repo | ||
|
|
@@ -45,7 +45,7 @@ jobs: | |
| run: | | ||
| export DISPLAY=":1" | ||
| Xvfb :1 -screen 0 800x600x8 & | ||
| mvn -U -B clean -P windows-linux install -T 1C -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} | ||
| mvn -U -B clean -P windows-linux install -T 1C -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ github.token }} | ||
|
|
||
|
|
@@ -55,21 +55,21 @@ jobs: | |
|
|
||
| - name: Rename before upload | ||
| run: | | ||
| mkdir tarball | ||
| mkdir izpack | ||
| # If this works just gotta figure out how to append datetime | ||
| mv /home/runner/.m2/repository/forge/forge-gui-desktop/*/*.bz2 tarball/ | ||
| cd tarball | ||
| out="$(basename -s .tar.bz2 *)" | ||
| mv /home/runner/.m2/repository/forge/forge-installer/*/*.jar izpack/ | ||
| cd izpack | ||
| out="$(basename -s .jar *)" | ||
| d=$(date +%m-%d) | ||
| mv "${out}.tar.bz2" "${out}-${d}.tar.bz2" | ||
| mv "${out}.jar" "${out}-${d}.jar" | ||
| - name: 📂 Sync files | ||
| uses: SamKirkland/[email protected] | ||
| with: | ||
| server: ftp.cardforge.org | ||
| username: ${{ secrets.FTP_USERNAME }} | ||
| password: ${{ secrets.FTP_PASSWORD }} | ||
| local-dir: tarball/ | ||
| local-dir: izpack/ | ||
| server-dir: downloads/dailysnapshots/ | ||
| exclude: | | ||
| *.jar | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| name: Test Android build | ||
|
|
||
| on: | ||
| push: | ||
| paths: [ 'forge-gui-android/**' ] | ||
| pull_request: | ||
| paths: [ 'forge-gui-android/**' ] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| deployments: write | ||
| packages: write | ||
| strategy: | ||
| matrix: | ||
| java: [ '17' ] | ||
| name: Test with Java ${{ matrix.Java }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
| distribution: 'temurin' | ||
| cache: 'maven' | ||
|
|
||
| - name: Install old maven (3.8.1) | ||
| run: | | ||
| curl -o apache-maven-3.8.1-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz | ||
| tar xf apache-maven-3.8.1-bin.tar.gz | ||
| export PATH=$PWD/apache-maven-3.8.1/bin:$PATH | ||
| export MAVEN_HOME=$PWD/apache-maven-3.8.1 | ||
| mvn --version | ||
| - name: Set Up Android tools | ||
| run: | | ||
| JAVA_HOME=${JAVA_HOME_17_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;35.0.0" "platform-tools" "platforms;android-35" | ||
| - name: Install Android maven plugin | ||
| run: | | ||
| mkdir -p ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2 | ||
| cd ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.2 | ||
| curl -L -o android-maven-plugin-4.6.2.jar https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.jar | ||
| curl -L -o android-maven-plugin-4.6.2.pom https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.2/android-maven-plugin-4.6.2.pom | ||
| #mvn install:install-file -Dfile=android-maven-plugin-4.6.2.jar -DgroupId=com.simpligility.maven.plugins -DartifactId=android-maven-plugin -Dversion=4.6.2 -Dpackaging=jar | ||
| cd - | ||
| mvn install -Dmaven.test.skip=true | ||
| mvn dependency:tree | ||
| - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server | ||
| run: command -v Xvfb >/dev/null 2>&1 || { sudo apt update && sudo apt install -y xvfb; } | ||
|
|
||
| - name: Run build in virtual framebuffer | ||
| run: | | ||
| export DISPLAY=":1" | ||
| Xvfb :1 -screen 0 800x600x8 & | ||
| mvn -U -B -P android-test-build verify -e -T 1C -Dandroid.sdk.path=$ANDROID_SDK_ROOT -Dandroid.buildToolsVersion=35.0.0 -Dmaven.test.skip=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.