Update sync.yaml

Bump dawidd6/action-download-artifact from 3 to 6 in /.github/workflows

.github/workflows/ant.yml

@@ -5,7 +5,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
           path: I2P-*.dmg
 
   build-22:
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -44,45 +44,4 @@ 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

@@ -54,7 +54,7 @@ jobs:
           sleep 1m
       - name: Download artifacts
         id: download-artifact
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v6
         with:
           skip_unpack: true
           workflow: ant.yml

.github/workflows/sync.yaml

@@ -0,0 +1,66 @@
+# GitHub Actions workflow file to sync an external repository to this GitHub mirror.
+# This file was automatically generated by go-github-sync.
+#
+# The workflow does the following:
+# - Runs on a scheduled basis (and can also be triggered manually)
+# - Clones the GitHub mirror repository
+# - Fetches changes from the primary external repository
+# - Applies those changes to the mirror repository
+# - Pushes the updated content back to the GitHub mirror
+#
+# Authentication is handled by the GITHUB_TOKEN secret provided by GitHub Actions.
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate Github Actions Environment
+        run: if [ "$GITHUB_ACTIONS" != "true" ]; then echo 'This script must be run in a GitHub Actions environment.'; exit 1; fi
+      - name: Checkout GitHub Mirror
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Configure Git
+        run: |-
+          git config user.name 'GitHub Actions'
+          git config user.email 'actions@github.com'
+      - env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        name: Sync Primary Repository
+        run: |-
+          # Add the primary repository as a remote
+          git remote add primary https://i2pgit.org/I2P_Developers/i2p-jpackage-mac.git
+
+          # Fetch the latest changes from the primary repository
+          git fetch primary
+
+          # Check if the primary branch exists in the primary repository
+          if git ls-remote --heads primary master | grep -q master; then
+            echo "Primary branch master found in primary repository"
+          else
+            echo "Error: Primary branch master not found in primary repository"
+            exit 1
+          fi
+
+          # Check if we're already on the mirror branch
+          if git rev-parse --verify --quiet master; then
+            git checkout master
+          else
+            # Create the mirror branch if it doesn't exist
+            git checkout -b master
+          fi
+
+
+          # Force-apply all changes from primary, overriding any conflicts
+          echo "Performing force sync from primary/master to master"
+          git reset --hard primary/master
+
+
+          # Push changes back to the mirror repository
+          git push origin master
+name: Sync Primary Repository to GitHub Mirror
+"on":
+  push: {}
+  schedule:
+    - cron: 0 0 * * *
+  workflow_dispatch: {}

build.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 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-)
-
+export GITHUB_TAG=$(git describe --tags `git rev-list --tags --max-count=1` | sed -E -e 's/-[0-9]+$//' | sed 's|i2p||g' | tr -d a-z-)
+echo "tag is: $GITHUB_TAG"
 if echo "$GITHUB_TAG" | grep -q '.\..\..'; then
     PUBLISH_VERSION="$GITHUB_TAG"
 else
@@ -74,7 +74,7 @@ I2P_SRC_BASE=$HERE/i2p.i2p/
 
 rm -rf "$I2P_SRC"
 if [ ! -d "$I2P_SRC_BASE" ]; then
-    git clone https://i2pgit.org/i2p-hackers/i2p.i2p "$I2P_SRC_BASE"
+    git clone https://i2pgit.org/I2P_Developers/i2p.i2p "$I2P_SRC_BASE"
 fi
 cd "$I2P_SRC_BASE" && git pull --tags && cd "$HERE"
 git clone -b "$I2P_VERSION" "$I2P_SRC_BASE" "$I2P_SRC"
@@ -176,5 +176,5 @@ jpackage --name I2P --app-version "$PUBLISH_VERSION" \
         --mac-entitlements resources/entitlements.xml \
         --input build --main-jar launcher.jar --main-class net.i2p.router.MacLauncher
 
-UNAME=$(uname -m)
-cp -v I2P*.dmg "I2P-$PUBLISH_VERSION-$UNAME.dmg"
+ls -lah I2P*.dmg
+ls -lahd I2P*