Compare commits

...

8 Commits

9 changed files with 110 additions and 38 deletions

View File

@ -107,7 +107,7 @@ jobs:
- run: echo enabled=1 >> /etc/yum.repos.d/adoptium.repo
- run: echo gpgcheck=1 >> /etc/yum.repos.d/adoptium.repo
- run: echo gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public >> /etc/yum.repos.d/adoptium.repo
- run: dnf clean all && rm -r /var/cache/dnf && dnf upgrade -y && dnf update -y
- run: dnf clean all && rm -rf /var/cache/dnf && dnf upgrade -y && dnf update -y
- run: dnf install -y temurin-21-jdk
- name: Generate override.properties
run: |

82
.github/workflows/nightly.yml vendored Normal file
View File

@ -0,0 +1,82 @@
name: Nightly
#on: [push]
on:
push:
branches:
- main
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
with:
sparse-checkout: |
CHANGES.md
sparse-checkout-cone-mode: false
- name: sleep 15 minutes
run: |
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.yml
if_no_artifact_found: fail
# remove .zip file extension
- run: for f in *.zip; do unzip "$f"; rm "$f"; done
- run: echo "" | tee -a CHANGES.md
- run: echo "## Checksums" | tee -a CHANGES.md
- run: echo "" | tee -a CHANGES.md
- run: echo '```' | tee -a CHANGES.md
- run: sha256sum * | tee -a CHANGES.md
- run: echo '```' | tee -a CHANGES.md
- run: echo "" | tee -a CHANGES.md
- run: echo '```' | tee -a CHANGES.md
- run: file * | tee -a CHANGES.md
- run: echo '```' | tee -a CHANGES.md
- run: echo "" | tee -a CHANGES.md
- name: Upload artifacts
uses: ncipollo/release-action@v1
with:
commit: $GITHUB_SHA
name: nightly
prerelease: true
makeLatest: true
allowUpdates: true
artifacts: "*"
bodyFile: "CHANGES.md"

View File

@ -1,3 +1,8 @@
2025 Tue, January 7
-------------------
- Disable downloading Chrome extensions, begin phasing out Chrome support
Sat, October 19
---------------

View File

@ -7,7 +7,7 @@ RUN echo enabled=1 >> /etc/yum.repos.d/adoptium.repo
RUN echo gpgcheck=1 >> /etc/yum.repos.d/adoptium.repo
RUN echo gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public >> /etc/yum.repos.d/adoptium.repo
RUN cat /etc/yum.repos.d/adoptium.repo
RUN dnf clean all && rm -r /var/cache/dnf && dnf upgrade -y && dnf update -y
RUN dnf clean all && rm -rf /var/cache/dnf && dnf upgrade -y && dnf update -y
RUN dnf -y install rpm-build temurin-19-jdk
ADD . /src/i2p.plugins.firefox
WORKDIR /src/i2p.plugins.firefox

View File

@ -9,11 +9,11 @@ i2p-in-private-browsing
2.7.0
https://addons.mozilla.org/firefox/downloads/file/4364373/i2p_in_private_browsing-2.7.0.xpi
noscript
11.4.42
https://addons.mozilla.org/firefox/downloads/file/4363712/noscript-11.4.42.xpi
12.1.1
https://addons.mozilla.org/firefox/downloads/file/4411102/noscript-12.1.1.xpi
localcdn-fork-of-decentraleyes
2.6.74
https://addons.mozilla.org/firefox/downloads/file/4364493/localcdn_fork_of_decentraleyes-2.6.74.xpi
2.6.76
https://addons.mozilla.org/firefox/downloads/file/4401439/localcdn_fork_of_decentraleyes-2.6.76.xpi
onion-in-container-browsing
0.82
https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi
@ -21,26 +21,11 @@ javascript-restrictor
0.19.1
https://addons.mozilla.org/firefox/downloads/file/4352350/javascript_restrictor-0.19.1.xpi
ublock-origin
1.60.0
https://addons.mozilla.org/firefox/downloads/file/4359936/ublock_origin-1.60.0.xpi
1.61.2
https://addons.mozilla.org/firefox/downloads/file/4391011/ublock_origin-1.61.2.xpi
```
## Chromium
```md
__MSG_extensionName__
1.29
https://clients2.google.com/service/update2/crx
NoScript
11.4.42
https://clients2.google.com/service/update2/crx
LocalCDN
2.6.73
https://clients2.google.com/service/update2/crx
uBlock Origin
1.60.0
https://clients2.google.com/service/update2/crx
__MSG_extensionName__
0.19.1
https://clients2.google.com/service/update2/crx
```

View File

@ -885,7 +885,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
<redirector output="VERSION.md" error="VERSION.md" alwayslog="true" append="true"></redirector>
<arg value="```md"/>
</exec>
<exec executable="manifest-json-version" failonerror="true">
<!--<exec executable="manifest-json-version" failonerror="true">
<redirector output="VERSION.md" error="VERSION.md" alwayslog="true" append="true"></redirector>
<arg value="-mf"/>
<arg value="src/i2p.chromium.base.profile/extensions/i2pchrome.js/manifest.json"/>
@ -909,7 +909,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
<redirector output="VERSION.md" error="VERSION.md" alwayslog="true" append="true"></redirector>
<arg value="-mf"/>
<arg value="src/i2p.chromium.usability.profile/extensions/jshelter.js/manifest.json"/>
</exec>
</exec>-->
<exec executable="echo" failonerror="true">
<redirector output="VERSION.md" error="VERSION.md" alwayslog="true" append="true"></redirector>
<arg value="```"/>
@ -918,20 +918,20 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
<target name="i2pChromiumBaseProfile">
<mkdir dir="src/i2p.chromium.base.profile/extensions/" />
<exec executable="crx3" failonerror="true">
<!--<exec executable="crx3" failonerror="true">
<arg value="download"/>
<arg value="ikdjcmomgldfciocnpekfndklkfgglpe" />
<arg value="-u=true"/>
<arg value="-o" />
<arg value="src/i2p.chromium.base.profile/extensions/i2pchrome.js.crx" />
</exec>
<exec executable="crx3" failonerror="true">
</exec>-->
<!--<exec executable="crx3" failonerror="true">
<arg value="download"/>
<arg value="doojmbjmlfjjnbmnoijecmcbfeoakpjm" />
<arg value="-u=true"/>
<arg value="-o" />
<arg value="src/i2p.chromium.base.profile/extensions/noscript.js.crx" />
</exec>
</exec>-->
<exec executable="echo" failonerror="true" append="false" output="src/i2p.chromium.base.profile/version.md">
<arg value="Profile Version" />
</exec>
@ -951,7 +951,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
<target name="i2pChromiumUsabilityProfile">
<mkdir dir="src/i2p.chromium.usability.profile/extensions/" />
<exec executable="crx3" failonerror="true">
<!--<exec executable="crx3" failonerror="true">
<arg value="download"/>
<arg value="ikdjcmomgldfciocnpekfndklkfgglpe" />
<arg value="-u=true"/>
@ -978,7 +978,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
<arg value="-u=true"/>
<arg value="-o" />
<arg value="src/i2p.chromium.usability.profile/extensions/localcdn.js.crx" />
</exec>
</exec>-->
<exec executable="echo" failonerror="true" append="false" output="src/i2p.chromium.usability.profile/version.md">
<arg value="Profile Version" />
</exec>

Binary file not shown.

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Fri Oct 18 23:29:32 EDT 2024
build.number=792
#Tue Jan 07 18:04:41 EST 2025
build.number=805

View File

@ -116,7 +116,7 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
_log.info("I2P Browser tray manager not supported");
try {
I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
String[] args = {"http://proxy.i2p"};
String[] args = {"http://127.0.0.1:7657"};
i2pBrowser.launchFirefox(0, args);
} catch (Exception e) {
_log.error("Error starting I2P Browser", e);
@ -124,7 +124,7 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
} else {
try {
_log.info(
"Starting I2P Browser tray manager by testing http://proxy.i2p");
"Starting I2P Browser tray manager by testing http://127.0.0.1:7657");
MenuService dtg = startTrayApp();
try {
Thread.sleep(5000);
@ -144,7 +144,7 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
_log.info("I2P Browser tray manager not found");
}
I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
String[] args = {"http://proxy.i2p"};
String[] args = {"http://127.0.0.1:7657"};
i2pBrowser.launchFirefox(0, args);
} catch (Exception e) {
_log.error("Error starting I2P Browser tray manager", e);
@ -211,7 +211,7 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
_log.info("I2P Browser starting up");
try {
I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
String[] args = {"http://proxy.i2p"};
String[] args = {"http://127.0.0.1:7657"};
i2pBrowser.launchFirefox(0, args);
} catch (Exception e) {
_log.error("Error starting I2P Browser", e);
@ -235,7 +235,7 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
try {
I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
i2pBrowser.usability = true;
String[] args = {"http://proxy.i2p"};
String[] args = {"http://127.0.0.1:7657"};
i2pBrowser.launchFirefox(0, args);
} catch (Exception e) {
_log.error("Error starting I2P Browser", e);