Compare commits

..

34 Commits

Author SHA1 Message Date
8a22bb8277 test build 2025-02-11 22:25:28 -05:00
56b3317184 test build 2025-02-11 21:43:24 -05:00
de8420c5b2 test build 2025-02-11 21:08:41 -05:00
80dfa2498c test build 2025-02-11 20:51:51 -05:00
a60da07d5a bump version 2025-02-11 14:16:37 -05:00
ccd2edbc20 Fix release redownload script 2024-10-20 15:57:07 -04:00
5a2143a5b0 Update release notes 2024-10-19 14:02:40 -04:00
87e4b3d0d6 Get ready for 2.7.0 2024-10-19 14:00:03 -04:00
e50c862903 pick a release version for nightly master builds 2024-08-26 19:56:32 -04:00
3050624b81 pick a release version for nightly master builds 2024-08-26 19:41:56 -04:00
e1cbbbf284 pick a release version for nightly master builds 2024-08-26 19:34:10 -04:00
1a18d38522 pick a release version for nightly master builds 2024-08-26 19:24:01 -04:00
78ad39e142 only derive profile tag from i2p tag if it exists 2024-08-26 19:10:20 -04:00
919be083e1 tag master builds as master not as numbered version 2024-08-26 19:01:40 -04:00
3d48629a40 If tags are absent, pull from master, so nightlies are really nightlies 2024-08-26 18:53:24 -04:00
5f9df2cb9a If tags are absent, pull from master, so nightlies are really nightlies 2024-08-26 18:50:33 -04:00
a1f093f0b0 use I2P_VERSION not GITHUB_TAG for CI builds 2024-08-26 18:40:02 -04:00
55e10a1633 update release notes 2024-08-26 18:18:16 -04:00
0f470f08ff update release notes 2024-08-26 18:16:07 -04:00
1ea7ccb671 Add jpackage archives and prebuilt jpackage to CI 2024-08-26 18:05:57 -04:00
e3e9d71f62 make the i2pversion script output the version that we're actually building 2024-08-22 23:39:44 -04:00
d2cb4e7dac Bump i2pfirefox version 2024-08-22 23:37:54 -04:00
d3bc6ffc89 Remove redundant whitespace 2024-08-01 17:04:29 -04:00
0c7e4a9fd6 Remove redundant functions 2024-08-01 17:03:11 -04:00
0f271a9013 bump version 2024-07-20 22:40:25 -04:00
a01b11ecb0 bump version 2024-07-20 22:08:57 -04:00
0eea4f9fcb wait longer and re-trigger 2024-07-17 14:34:47 -04:00
acb936a675 fix wrong name 2024-07-16 19:40:32 -04:00
45f64db3cd fix wrong name 2024-07-16 19:09:52 -04:00
3769d7a74c separate out the release-nightly-latest job 2024-07-16 16:35:26 -04:00
45873071fb separate out the release-nightly-latest job 2024-07-16 15:28:38 -04:00
a96502d5c1 add 22 builds to nightly releases 2024-07-16 15:23:24 -04:00
83d02cf379 Change name of build task for jdk22 builds 2024-07-16 15:10:27 -04:00
1463e62c2a Continuously build jdk22 builds 2024-07-16 14:58:51 -04:00
16 changed files with 288 additions and 66 deletions

128
.github/workflows/ant-latest.yml vendored Normal file
View File

@ -0,0 +1,128 @@
name: Java 22 CI
on: [push]
jobs:
nsis-jdk22:
runs-on: windows-latest
steps:
- uses: Vampire/setup-wsl@v3
with:
distribution: Ubuntu-20.04
- name: Set git to use LF
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global user.email "github@i2p.net"
git config --global user.name "eyedeekay Github CI Build"
- uses: actions/checkout@v4
- run: wsl apt-get update
- run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext
- name: Set up JDK 22
uses: actions/setup-java@v4
with:
java-version: '22'
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:
name: I2P-Easy-Install-Bundle-unsigned-jdk22.exe
path: I2P-Easy-Install-Bundle-*.exe
buildjpackagexe-jdk22:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 22
uses: actions/setup-java@v4
with:
java-version: '22'
distribution: 'temurin'
- name: build with script
run: bash -c "./buildscripts/exe.sh; ls *.exe"
- name: Upload I2P-Easy-Install-Bundle-unsigned.exe
uses: actions/upload-artifact@v4
with:
name: I2P-EXE-unsigned-jdk22.exe
path: I2P-EXE-*.exe
buildjpackagmsi-jdk22:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 22
uses: actions/setup-java@v4
with:
java-version: '22'
distribution: 'temurin'
- name: build with script
run: bash -c "./buildscripts/msi.sh; ls *.msi"
- name: Upload I2P-Easy-Install-Bundle-unsigned.msi
uses: actions/upload-artifact@v4
with:
name: I2P-MSI-unsigned-jdk22.msi
path: I2P-MSI-*.msi
buildzip-jdk22:
runs-on: windows-latest
steps:
- uses: Vampire/setup-wsl@v3
with:
distribution: Ubuntu-20.04
- name: Set git to use LF
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global user.email "github@i2p.net"
git config --global user.name "eyedeekay Github CI Build"
- uses: actions/checkout@v4
- run: wsl apt-get update
- run: wsl apt-cache search 7zip
- run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext zip p7zip-full ca-certificates
- run: choco install wget
- name: Set up JDK 22
uses: actions/setup-java@v4
with:
java-version: '22'
distribution: 'temurin'
- name: build with script
run: bash -c "./buildscripts/zip.sh; ls -d * */* "
- name: Upload I2P-windows-portable.zip
uses: actions/upload-artifact@v4
with:
name: I2P-windows-portable-jdk22.zip
path: I2P-windows-portable.zip
buildtgz-jdk22:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 22
uses: actions/setup-java@v4
with:
java-version: '22'
distribution: 'temurin'
- run: |
sudo apt-get update
sudo apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext
- name: build with script
run: ./buildscripts/targz.sh; ls *.tar.gz
- name: Upload I2P.tar.gz
uses: actions/upload-artifact@v4
with:
name: I2P-jdk22.tar.gz
path: I2P.tar.gz

View File

@ -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:

View File

@ -0,0 +1,94 @@
name: Nightly Release
on: [push]
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
with:
sparse-checkout: |
changelog.txt
docs/RELEASE.md
sparse-checkout-cone-mode: false
- name: sleep 22 minutes
run: |
echo "sleeping 22 minutes to wait for artifacts"
sleep 1m
echo "sleeping 21 minutes to wait for artifacts"
sleep 1m
echo "sleeping 20 minutes to wait for artifacts"
sleep 1m
echo "sleeping 19 minutes to wait for artifacts"
sleep 1m
echo "sleeping 18 minutes to wait for artifacts"
sleep 1m
echo "sleeping 17 minutes to wait for artifacts"
sleep 1m
echo "sleeping 16 minutes to wait for artifacts"
sleep 1m
echo "sleeping 15 minutes to wait for artifacts"
sleep 1m
echo "sleeping 14 minutes to wait for artifacts"
sleep 1m
echo "sleeping 13 minutes to wait for artifacts"
sleep 1m
echo "sleeping 12 minutes to wait for artifacts"
sleep 1m
echo "sleeping 11 minutes to wait for artifacts"
sleep 1m
echo "sleeping 10 minutes to wait for artifacts"
sleep 1m
echo "sleeping 9 minutes to wait for artifacts"
sleep 1m
echo "sleeping 8 minutes to wait for artifacts"
sleep 1m
echo "sleeping 7 minutes to wait for artifacts"
sleep 1m
echo "sleeping 6 minutes to wait for artifacts"
sleep 1m
echo "sleeping 5 minutes to wait for artifacts"
sleep 1m
echo "sleeping 4 minutes to wait for artifacts"
sleep 1m
echo "sleeping 3 minutes to wait for artifacts"
sleep 1m
echo "sleeping 2 minutes to wait for artifacts"
sleep 1m
echo "sleeping 1 minutes to wait for artifacts"
sleep 1m
- name: Download artifacts
id: download-artifact
uses: dawidd6/action-download-artifact@v3
with:
skip_unpack: true
workflow: ant-latest.yml
if_no_artifact_found: fail
# remove .zip file extension
- run: for f in *.zip; do unzip "$f"; rm "$f"; done
- run: cp changelog.txt changelog-java22.txt
- run: echo "" | tee -a changelog-java22.txt
- run: echo "## Checksums" | tee -a changelog-java22.txt
- run: echo "" | tee -a changelog-java22.txt
- run: echo '```' | tee -a changelog-java22.txt
- run: sha256sum * | tee -a changelog-java22.txt
- run: echo '```' | tee -a changelog-java22.txt
- run: echo "" | tee -a changelog-java22.txt
- run: echo '```' | tee -a changelog-java22.txt
- run: file * | tee -a changelog-java22.txt
- run: echo '```' | tee -a changelog-java22.txt
- run: echo "" | tee -a changelog-java22.txt
- run: cat docs/RELEASE.md changelog-java22.txt > RELEASE.md
- name: Upload artifacts
uses: ncipollo/release-action@v1
with:
artifacts: "*"
prerelease: true
allowUpdates: true
replacesArtifacts: true
makeLatest: true
tag: nightly
bodyFile: "RELEASE.md"

View File

@ -1,4 +1,4 @@
name: Nightly Release
name: Nightly 22 Release
on: [push]

View File

@ -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

View File

@ -55,7 +55,12 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
rm -rf I2P
if [ ! -d "I2P" ]; then
"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
if echo "$I2P_VERSION" | grep "master"; then
RELEASE_VERSION="9.9.9"
else
RELEASE_VERSION="$I2P_VERSION"
fi
"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$RELEASE_VERSION" \
--verbose \
--java-options "-Xmx512m" \
--java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
@ -80,4 +85,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
cp -rv src/I2P/config build/I2P/config
zip -r I2P-Prebuilt.zip build/I2P/

View File

@ -8,7 +8,12 @@ cd "$SCRIPT_DIR" || exit 1
. ./config.sh
. ./i2pversion
./buildscripts/build.sh
jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
if echo "$I2P_VERSION" | grep "master"; then
RELEASE_VERSION="9.9.9"
else
RELEASE_VERSION="$I2P_VERSION"
fi
jpackage --name I2P-EXE --app-version "$RELEASE_VERSION" \
--verbose \
--java-options "-Xmx512m" \
--java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \

View File

@ -65,7 +65,6 @@ if [ -z "$EXTRA" ]; then
fi
if [ "$VERSION" = master ]; then
VERSIONDATE="$(date +%m%d)"
export TAG_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
else
export TAG_VERSION="$VERSION"
fi

View File

@ -9,7 +9,12 @@ cd "$SCRIPT_DIR" || exit 1
. ./i2pversion
"$SCRIPT_DIR"/buildscripts/build.sh
jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
if echo "$I2P_VERSION" | grep "master"; then
RELEASE_VERSION="9.9.9"
else
RELEASE_VERSION="$I2P_VERSION"
fi
jpackage --name I2P-MSI --app-version "$RELEASE_VERSION" \
--verbose \
--java-options "-Xmx512m" \
--java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \

View File

@ -29,14 +29,14 @@ fi
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "i2p-firefox-$I2P_VERSION"
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"
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-windows-portable.zip" -t "$I2P_VERSION"
github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-windows-portable.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.firefox -t "i2p-firefox-$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
github-release download -u "$GITHUB_USERNAME" -r i2p.firefox -t "i2p-firefox-$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"

View File

@ -41,8 +41,8 @@ echo "~~~~~~~~~~"
MAGNET=$(transmission-show -m "i2pwinupdate.su3.torrent" 2>&1 3>&1 | tail -n 1)
echo "$MAGNET"
ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3")
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
echo github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3.torrent")
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
echo github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"

View File

@ -1,6 +1,3 @@
# I2P Easy-Install Nightly Build
# I2P Easy-Install 2.8.0
This is a pre-release of the I2P Easy-Install Bundle for Windows.
It is built from the `master` branch of the `i2p.i2p` and `i2p.firefox` repositories.
It is a nightly build and may contain bugs.
Use it at your own risk.
This release updates the embedded I2P router to I2P 2.8.0.

View File

@ -14,22 +14,26 @@ if [ -z "$VERSIONBUILD" ]; then
VERSIONBUILD=$(echo "$GITHUB_TAG" | cut -d . -f 3)
fi
if [ -z "$VERSIONMAJOR" ]; then
VERSIONMAJOR=2
I2P_VERSION="master"
export I2P_VERSION="master"
VERSION="master"
export VERSION="master"
I2PFIREFOX_VERSION="2.8.0"
export I2PFIREFOX_VERSION="2.8.0"
else
I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
VERSION="i2p-$I2P_VERSION"
export VERSION="i2p-$I2P_VERSION"
I2PFIREFOX_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
export I2PFIREFOX_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
fi
if [ -z "$VERSIONMINOR" ]; then
VERSIONMINOR=5
fi
if [ -z "$VERSIONBUILD" ]; then
VERSIONBUILD=2
fi
I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
# Comment this out to build from an alternate branch or
# the tip of the master branch.
#VERSION=i2p-2.4.0
#export VERSION=i2p-2.4.0
VERSION=master
export VERSION=master
I2PFIREFOX_VERSION=$I2P_VERSION
export I2PFIREFOX_VERSION=$I2P_VERSION
echo "I2P version $I2P_VERSION"
echo "Tag $VERSION"
echo "I2P Firefox Profile version $I2PFIREFOX_VERSION"

View File

@ -80,29 +80,4 @@ public class I2PAppUtil extends WindowsAppUtil {
}
return true;
}
/**
* get the path to the binary of the app-image root by getting the path to
* java.home and the OS, and traversing up to the app-image root based on that
* information, then getting the binary path on a per-platform basis. The path
* returned will be relative to the root.
*
* @return the app-image root
*/
protected String appImageExe() {
File aih = appImageHome();
if (aih != null) {
// get the name of the aih directory itself, which will be the default
// name of the executable as well
String baseName = "I2P";
switch (osName()) {
case "windows":
return baseName + ".exe";
case "mac":
case "linux":
return "./bin/" + baseName;
}
}
return null;
}
}

View File

@ -84,7 +84,7 @@ public class WindowsAppUtil extends WindowsServiceUtil {
* information, then getting the binary path on a per-platform basis. The path
* returned will be relative to the root.
*
* @return the app-image root
* @return the app-image root + the path to the executable
*/
protected String appImageExe() {
File aih = appImageHome();

View File

@ -1,3 +1,3 @@
!define VERSIONMAJOR 2
!define VERSIONMINOR 5
!define VERSIONBUILD 2
!define VERSIONMINOR 6
!define VERSIONBUILD 0