mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 10:48:00 +00:00
Improve android versioning + autoupdate (#4240)
This commit is contained in:
29
.github/workflows/snapshots-android.yml
vendored
29
.github/workflows/snapshots-android.yml
vendored
@@ -87,16 +87,33 @@ jobs:
|
|||||||
- name: Build/Install/Publish to GitHub Packages Apache Maven
|
- name: Build/Install/Publish to GitHub Packages Apache Maven
|
||||||
run: |
|
run: |
|
||||||
export _JAVA_OPTIONS="-Xmx2g"
|
export _JAVA_OPTIONS="-Xmx2g"
|
||||||
|
d=$(date +%m-%d)
|
||||||
|
# Replace date in forge-gui-mobile/src/forge/Forge.java
|
||||||
|
sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
|
||||||
mvn -U -B -P android-release-build,android-release-sign 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
|
mvn -U -B -P android-release-build,android-release-sign 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 }}
|
|
||||||
|
|
||||||
- name: Move important file
|
|
||||||
run: |
|
|
||||||
mkdir -p forge-gui-android/target/upload
|
mkdir -p forge-gui-android/target/upload
|
||||||
mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
|
mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
|
||||||
mv forge-gui-android/target/assets.zip forge-gui-android/target/upload/
|
mv forge-gui-android/target/assets.zip forge-gui-android/target/upload/
|
||||||
ls forge-gui-android/target/upload/
|
cd forge-gui-android/target/upload/
|
||||||
|
# Get the first APK file in the folder
|
||||||
|
ls
|
||||||
|
apk_file=$(find . -maxdepth 1 -type f -name '*.apk' -print -quit)
|
||||||
|
|
||||||
|
if [ -n "$apk_file" ]; then
|
||||||
|
version=$(echo "$apk_file" | grep -oP 'forge-android-\K\d+\.\d+\.\d+-SNAPSHOT' | sed 's/-signed-aligned.apk//')
|
||||||
|
echo "APK File: $apk_file"
|
||||||
|
echo "Version: $version"
|
||||||
|
mv *.apk "forge-android-$version-$d-signed-aligned.apk"
|
||||||
|
|
||||||
|
echo "$version-$d" > version.txt
|
||||||
|
else
|
||||||
|
echo "No .apk files found in the specified folder."
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd -
|
||||||
|
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
|
|
||||||
- name: 📂 Sync files
|
- name: 📂 Sync files
|
||||||
uses: SamKirkland/FTP-Deploy-Action@v4.3.4
|
uses: SamKirkland/FTP-Deploy-Action@v4.3.4
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<packaging.type>jar</packaging.type>
|
<packaging.type>jar</packaging.type>
|
||||||
<build.min.memory>-Xms1024m</build.min.memory>
|
<build.min.memory>-Xms1024m</build.min.memory>
|
||||||
<build.max.memory>-Xmx1536m</build.max.memory>
|
<build.max.memory>-Xmx1536m</build.max.memory>
|
||||||
<alpha-version>1.6.59.001</alpha-version>
|
<alpha-version>1.6.59-SNAPSHOT</alpha-version>
|
||||||
<sign.keystore>keystore</sign.keystore>
|
<sign.keystore>keystore</sign.keystore>
|
||||||
<sign.alias>alias</sign.alias>
|
<sign.alias>alias</sign.alias>
|
||||||
<sign.storepass>storepass</sign.storepass>
|
<sign.storepass>storepass</sign.storepass>
|
||||||
|
|||||||
@@ -118,7 +118,7 @@
|
|||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- TODO: insert placeholder for latest version tag -->
|
<!-- TODO: insert placeholder for latest version tag -->
|
||||||
<fromRef>forge-1.6.55</fromRef>
|
<fromRef>forge-1.6.58</fromRef>
|
||||||
<file>../forge-gui/release-files/CHANGES.txt</file>
|
<file>../forge-gui/release-files/CHANGES.txt</file>
|
||||||
<templateContent>
|
<templateContent>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ import java.nio.file.Paths;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
public class Forge implements ApplicationListener {
|
public class Forge implements ApplicationListener {
|
||||||
public static final String CURRENT_VERSION = "1.6.59.001-SNAPSHOT";
|
public static final String CURRENT_VERSION = "1.6.59-SNAPSHOT";
|
||||||
|
|
||||||
private static ApplicationListener app = null;
|
private static ApplicationListener app = null;
|
||||||
static Scene currentScene = null;
|
static Scene currentScene = null;
|
||||||
|
|||||||
Reference in New Issue
Block a user