Rename artifacts afte building

.github/workflows/ant.yml

@@ -5,7 +5,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
       - uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
           path: I2P-*.dmg
 
   build-22:
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
       - uses: actions/checkout@v4
@@ -44,4 +44,45 @@ jobs:
           name: I2P-${{ github.sha }}-22.dmg
           path: I2P-*.dmg
         
+  build-m1:
+    runs-on: macos-14
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: ./build.sh
+      - name: Upload I2P-${{ github.sha }}.dmg
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-${{ github.sha }}-m1.dmg
+          path: I2P-*.dmg
+
+  build-22-m1:
+    runs-on: macos-14
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+      - name: build with script
+        run: ./build.sh
+      - name: Upload I2P-${{ github.sha }}.dmg
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-${{ github.sha }}-m1-jdk22.dmg
+          path: I2P-*.dmg
+        
+
 

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
           workflow: ant.yml
           if_no_artifact_found: fail
       # remove .zip file extension
-      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      - run: for f in *.zip; do unzip -o "$f"; rm "$f"; done
       - run: echo "" | tee -a docs/RELEASE.md
       - run: echo "## Checksums" | tee -a docs/RELEASE.md
       - run: echo "" | tee -a docs/RELEASE.md

build.sh

@@ -3,6 +3,16 @@ set -e
 git describe --tags `git rev-list --tags --max-count=1` || exit 1
 export GITHUB_TAG=$(git describe --tags `git rev-list --tags --max-count=1` | sed 's|i2p||g' | tr -d a-z-)
 
+if echo "$GITHUB_TAG" | grep -q '.\..\..'; then
+    PUBLISH_VERSION="$GITHUB_TAG"
+else
+    echo "github tag $GITHUB_TAG does not match version pattern"
+    # no way to guess here, so if it's unset it must default to the latest version number:
+    if [ -z "$PUBLISH_VERSION" ]; then
+        PUBLISH_VERSION="2.7.0"
+    fi
+fi
+
 if [ -z "$I2P_VERSION" ]; then
     I2P_VERSION="i2p-$GITHUB_TAG"
 fi
@@ -17,6 +27,8 @@ else
     fi
 fi
 
+echo "using $PUBLISH_VERSION as our release version to placate jpackage"
+
 if [ -z "$I2P_BUILD_NUMBER" ]; then
     I2P_BUILD_NUMBER=1
 fi
@@ -152,7 +164,7 @@ fi
 # consider there might be some reason to re-enable this if an external maintainer arrives
 #cp "$HERE"/resources/*.crt I2P.app/Contents/Resources/certificates/router
 
-jpackage --name I2P  \
+jpackage --name I2P --app-version "$PUBLISH_VERSION" \
         --java-options "-Xmx512m" \
         --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
         --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
@@ -164,5 +176,5 @@ jpackage --name I2P  \
         --mac-entitlements resources/entitlements.xml \
         --input build --main-jar launcher.jar --main-class net.i2p.router.MacLauncher
 
-ls -lah I2P*.dmg
-ls -lahd I2P*
+UNAME=$(uname -m)
+cp -v I2P*.dmg "I2P-$PUBLISH_VERSION-$UNAME.dmg"