mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 11:48:02 +00:00
fix compilation
This commit is contained in:
2
.github/workflows/snapshots-android.yml
vendored
2
.github/workflows/snapshots-android.yml
vendored
@@ -91,7 +91,7 @@ jobs:
|
||||
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
|
||||
# sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
|
||||
mvn -U -B -P android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=35.0.0 -Dmaven.test.skip=true
|
||||
mkdir -p forge-gui-android/target/upload
|
||||
mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
|
||||
|
||||
14
.github/workflows/snapshots-pc.yml
vendored
14
.github/workflows/snapshots-pc.yml
vendored
@@ -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,13 +55,13 @@ 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/FTP-Deploy-Action@v4.3.4
|
||||
@@ -69,7 +69,7 @@ jobs:
|
||||
server: ftp.cardforge.org
|
||||
username: ${{ secrets.FTP_USERNAME }}
|
||||
password: ${{ secrets.FTP_PASSWORD }}
|
||||
local-dir: tarball/
|
||||
local-dir: izpack/
|
||||
server-dir: downloads/dailysnapshots/
|
||||
exclude: |
|
||||
*.jar
|
||||
|
||||
2
.github/workflows/test-build.yaml
vendored
2
.github/workflows/test-build.yaml
vendored
@@ -26,4 +26,4 @@ jobs:
|
||||
run: |
|
||||
export DISPLAY=":1"
|
||||
Xvfb :1 -screen 0 800x600x8 &
|
||||
mvn -U -B clean -P windows-linux test
|
||||
mvn -U -B clean -P test
|
||||
|
||||
Reference in New Issue
Block a user