From f7b498c5863ce412c24b98a79f28dd1c25acdda4 Mon Sep 17 00:00:00 2001 From: Chris H Date: Thu, 23 Nov 2023 22:41:57 -0500 Subject: [PATCH] Android release (#4203) Futzing with the Android Forge Version --- .github/workflows/maven-publish.yml | 4 +- .github/workflows/publish-android.yml | 89 +++++++++++++++++++++++++++ forge-gui-mobile/src/forge/Forge.java | 2 +- 3 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/publish-android.yml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 2573e9bd15a..e0e89b339ff 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -1,4 +1,4 @@ -name: Publish Forge +name: Publish Desktop Forge on: workflow_dispatch: @@ -38,4 +38,4 @@ jobs: Xvfb :1 -screen 0 800x600x8 & mvn -U -B clean -P windows-linux install release:clean release:prepare release:perform -T 1C -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} env: - GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file + GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml new file mode 100644 index 00000000000..4e8e3904cd1 --- /dev/null +++ b/.github/workflows/publish-android.yml @@ -0,0 +1,89 @@ +name: Publish Android Release + +on: + workflow_dispatch: + inputs: + debug_enabled: + type: boolean + description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' + required: false + default: false + + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: write + deployments: write + packages: write + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' + cache: 'maven' + server-id: cardforge-repo + server-username: ${{ secrets.FTP_USERNAME }} + server-password: ${{ secrets.FTP_PASSWORD }} + settings-path: ${{ github.workspace }} # location for the settings.xml file + + - name: Install old maven (3.6.3) + run: | + curl -o apache-maven-3.6.3-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz + tar xf apache-maven-3.6.3-bin.tar.gz + export PATH=$PWD/apache-maven-3.6.3/bin:$PATH + export MAVEN_HOME=$PWD/apache-maven-3.6.3 + mvn --version + + - name: Install android SDK + uses: maxim-lobanov/setup-android-tools@v1 + with: + packages: | + platforms;android-26 + build-tools;30.0.3 + + - 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; } + export DISPLAY=":1" + Xvfb :1 -screen 0 800x600x8 & + + - name: Extract Android keystore + run: | + ls + cd forge-gui-android + echo "${{ secrets.FORGE_KEYSTORE }}" > forge.keystore.asc + gpg -d --passphrase "${{ secrets.FORGE_KEYSTORE_PASSPHRASE }}" --batch forge.keystore.asc > forge.keystore + cd - + + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }} + + - name: Configure Git User + run: | + git config user.email "actions@github.com" + git config user.name "GitHub Actions" + + - name: Install Android maven plugin + run: | + mkdir -p ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.1 + cd ~/.m2/repository/com/simpligility/maven/plugins/android-maven-plugin/4.6.1 + curl -L -o android-maven-plugin-4.6.1.jar https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.1/android-maven-plugin-4.6.1.jar + curl -L -o android-maven-plugin-4.6.1.pom https://github.com/Card-Forge/android-maven-plugin/releases/download/4.6.1/android-maven-plugin-4.6.1.pom + #mvn install:install-file -Dfile=android-maven-plugin-4.6.1.jar -DgroupId=com.simpligility.maven.plugins -DartifactId=android-maven-plugin -Dversion=4.6.1 -Dpackaging=jar + cd - + mvn install -Dmaven.test.skip=true + mvn dependency:tree + + - name: Build/Install/Publish to GitHub Packages Apache Maven + run: | + export _JAVA_OPTIONS="-Xmx2g" + mvn -U -B -P android-release-build,android-release-sign,android-release-upload install -e -Dsign.keystore=forge.keystore -Dsign.alias=Forge -Dsign.storepass=${{ secrets.SIGN_STORE_PASS }} -Dsign.keypass=${{ secrets.SIGN_STORE_PASS }} -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=30.0.3 -Dmaven.test.skip=true + env: + GITHUB_TOKEN: ${{ github.token }} + diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 8d54acc94b0..c5dd520ab42 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -54,7 +54,7 @@ import java.util.*; public class Forge implements ApplicationListener { - public static final String CURRENT_VERSION = "1.6.58.001"; + public static final String CURRENT_VERSION = "1.6.59.001-SNAPSHOT"; private static ApplicationListener app = null; static Scene currentScene = null;