WIP. Compile against both architectures on one machine

neodix42 · Aug 10, 2024 · e1a160f · e1a160f
1 parent 7eb4e56
commit e1a160f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,13 +28,12 @@ jobs:
 
       - name: Build arm64-aarch64 mainnet
         run: |
-          git checkout arm64-aarch64
-          mvn clean compile package -DskipTests
+          mvn clean compile package -DskipTests -Darch=-aarch64
           cp target/MyLocalTon.jar artifacts/MyLocalTon-arm64.jar
 
       - name: Build arm64-aarch64 testnet
         run: |
-          mvn clean compile package -DskipTests -Dton_branch=testnet
+          mvn clean compile package -DskipTests -Dton_branch=testnet -Darch=-aarch64
           cp target/MyLocalTon.jar artifacts/MyLocalTon-arm64-testnet.jar
 
       - name: Checkout main branch
@@ -62,7 +61,7 @@ jobs:
           release_name: MyLocalTon v${{ github.run_number }}
           body: |
             ${{ steps.read_release.outputs.CHANGELOG_BODY }}
-          draft: false
+          draft: true
           prerelease: true
 
       - name: Upload binaries to release

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,5 @@
 ### Changes in this release
 
-Added creation of faucet wallet on start with constant mnemonic and address. v3r2, subWalletId=42, initialBalance =
-1mio.
-
-Faucet wallet raw address and mnemonic will be printed on console. You can find more details in
-MyLocalTonSettings.FaucetWalletSettings too.
+* draft release
 
 
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
         <java.version>11</java.version>
 
         <ton_branch>master</ton_branch>
-        <ton_branch>master</ton_branch>
+        <arch></arch> <!-- add when work or compile on/for arm64  -aarch64 -->
         <maven.compiler.release>11</maven.compiler.release>
         <maven.compiler.version>3.8.1</maven.compiler.version>
         <maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
@@ -100,19 +100,13 @@
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-web</artifactId>
             <version>${openjfx.version}</version>
-            <classifier>linux</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-web</artifactId>
-            <version>${openjfx.version}</version>
-            <classifier>mac</classifier>
+            <classifier>linux${arch}</classifier>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-web</artifactId>
             <version>${openjfx.version}</version>
-            <classifier>mac-aarch64</classifier>
+            <classifier>mac${arch}</classifier>
         </dependency>
 
         <dependency>
@@ -125,19 +119,13 @@
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
             <version>${openjfx.version}</version>
-            <classifier>linux</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics</artifactId>
-            <version>${openjfx.version}</version>
-            <classifier>mac</classifier>
+            <classifier>linux${arch}</classifier>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
             <version>${openjfx.version}</version>
-            <classifier>mac-aarch64</classifier>
+            <classifier>mac${arch}</classifier>
         </dependency>
 
         <dependency>