From 1ea7ccb671e04c43ee95d8b74771aa4d519a830b Mon Sep 17 00:00:00 2001
From: eyedeekay <hankhill19580@gmail.com>
Date: Mon, 26 Aug 2024 18:05:57 -0400
Subject: [PATCH] Add jpackage archives and prebuilt jpackage to CI

---
 .github/workflows/ant-latest.yml | 10 ++++++++++
 .github/workflows/ant.yml        | 10 ++++++++++
 README.md                        |  3 +--
 buildscripts/build.sh            |  3 ++-
 buildscripts/release-download.sh | 10 +++++-----
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ant-latest.yml b/.github/workflows/ant-latest.yml
index ad16e89..82a3ada 100644
--- a/.github/workflows/ant-latest.yml
+++ b/.github/workflows/ant-latest.yml
@@ -27,6 +27,16 @@ jobs:
           distribution: 'temurin'
       - name: build with script
         run: bash -c "./buildscripts/unsigned.sh; ls *.exe"
+      - name: Upload archived copy of I2P router source embedded in the build
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.i2p.jpackage-build.tar.gz
+          path: i2p.i2p.jpackage-build.tar.gz
+      - name: Upload prebuilt jpackage bundle without any plugins or modded config
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Prebuilt.zip
+          path: I2P-Prebuilt.zip
       - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 27b7634..86f1c9c 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -27,6 +27,16 @@ jobs:
           distribution: 'temurin'
       - name: build with script
         run: bash -c "./buildscripts/unsigned.sh; ls *.exe"
+      - name: Upload archived copy of I2P router source embedded in the build
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.i2p.jpackage-build.tar.gz
+          path: i2p.i2p.jpackage-build.tar.gz
+      - name: Upload prebuilt jpackage bundle without any plugins or modded config
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Prebuilt.zip
+          path: I2P-Prebuilt.zip
       - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
         uses: actions/upload-artifact@v4
         with:
diff --git a/README.md b/README.md
index 808e5ec..0806e5e 100644
--- a/README.md
+++ b/README.md
@@ -178,8 +178,7 @@ Doing a Release
 
 Once you have the installer `.exe` file produced by NSIS, you're almost ready to
 do a release. As a final step, someone must sign the `.exe` file using a
-Certificate which Windows will recognize. The current signer of the Windows
-bundle is Zlatinb. Standard Windows signing tools are used.
+Certificate which Windows will recognize. Standard Windows signing tools are used.
 
 ```sh
 ./release.sh
diff --git a/buildscripts/build.sh b/buildscripts/build.sh
index eea9b9b..faa7bba 100755
--- a/buildscripts/build.sh
+++ b/buildscripts/build.sh
@@ -80,4 +80,5 @@ cp "$SCRIPT_DIR/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt
 
 mkdir -p "$SCRIPT_DIR"/build/I2P
 cp -rv "$SCRIPT_DIR"/I2P/* "$SCRIPT_DIR"/build/I2P
-cp -rv src/I2P/config build/I2P/config
\ No newline at end of file
+cp -rv src/I2P/config build/I2P/config
+zip -r I2P-Prebuilt.zip build/I2P/
\ No newline at end of file
diff --git a/buildscripts/release-download.sh b/buildscripts/release-download.sh
index 00b4a1b..54886b8 100755
--- a/buildscripts/release-download.sh
+++ b/buildscripts/release-download.sh
@@ -33,10 +33,10 @@ echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy
 github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "i2p-firefox-$I2P_VERSION"
 
 echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
-github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "i2p-firefox-$I2P_VERSION"
 
-echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "$I2P_VERSION"
-github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "$I2P_VERSION"
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "i2p-firefox-$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "i2p-firefox-$I2P_VERSION"
 
-echo github-release download -u "$GITHUB_USERNAME" -r i2p -t "$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
-github-release download -u "$GITHUB_USERNAME" -r i2p -t "$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
+echo github-release download -u "$GITHUB_USERNAME" -r i2p -t "i2p-firefox-$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
+github-release download -u "$GITHUB_USERNAME" -r i2p -t "i2p-firefox-$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"