Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v7.4.0 #935

Merged
merged 145 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
439c989
don't use any
Gaojianli Jan 13, 2025
2fc1691
fix: IPv6 URL should has []
Gaojianli Jan 20, 2025
4547d3f
fix build error
Gaojianli Jan 20, 2025
a98928d
upgrade pnpm
Gaojianli Jan 20, 2025
cbcc734
upgrade pnpm
Gaojianli Jan 20, 2025
721b2e1
Merge branch 'dev' of github.com:PBH-BTN/PeerBanHelper into dev
Gaojianli Jan 20, 2025
d857d22
10.0.0
Gaojianli Jan 20, 2025
124e57b
webui ci should be run at dev too
Gaojianli Jan 20, 2025
e0e8ec4
Bump com.install4j:install4j-maven from 11.0.1 to 11.0.2
dependabot[bot] Jan 20, 2025
5e08e0d
Bump org.springframework:spring-context from 6.2.1 to 6.2.2
dependabot[bot] Jan 20, 2025
f9eb6b4
Merge branch 'refs/heads/master' into dev
Ghost-chu Jan 20, 2025
db03994
把杂七杂八的代码封进 static class 里
Ghost-chu Jan 20, 2025
82da52d
不要进行短横线替换
Ghost-chu Jan 20, 2025
2864b67
JCEF 支持 + 下载进度窗口
Ghost-chu Jan 20, 2025
e9f3d36
IPDB 也跟踪进度
Ghost-chu Jan 20, 2025
5c176c0
okok
Ghost-chu Jan 20, 2025
7015796
改进可读性
Ghost-chu Jan 20, 2025
cccd96c
bump version to 7.4.0-SNAPSHOT
Ghost-chu Jan 20, 2025
ef258ba
允许安装器控制 JCEF 安装
Ghost-chu Jan 21, 2025
fa34144
从 bytes 创建 InetAddress,以避免 InetAddress.getByName(String) 在某些情况下可能引发 D…
Ghost-chu Jan 21, 2025
84d964c
限制 JDK 查询最长时间为 3 秒 #889
Ghost-chu Jan 21, 2025
5015ce6
添加 DevTools
Ghost-chu Jan 21, 2025
cc5d427
移除 PGP 依赖
Ghost-chu Jan 21, 2025
8fb4e0b
改进 GUI 页面
Ghost-chu Jan 21, 2025
2e7a28f
cleanup
Ghost-chu Jan 21, 2025
8bb131a
在 EventLoop 上运行更新 UI 代码
Ghost-chu Jan 21, 2025
3bf6552
修复进度条
Ghost-chu Jan 21, 2025
8805961
任务栏进度条行为(第一版)
Ghost-chu Jan 21, 2025
eebc20b
进度条(第二版)
Ghost-chu Jan 21, 2025
bc396d3
fix bug
Ghost-chu Jan 21, 2025
1c05d77
PTR 限制最长查询时间
Ghost-chu Jan 21, 2025
fba8ecb
Update README.md
Ghost-chu Jan 22, 2025
70c509e
Merge pull request #924 from PBH-BTN/dependabot/maven/com.install4j-i…
Ghost-chu Jan 22, 2025
452b65c
Merge pull request #925 from PBH-BTN/dependabot/maven/org.springframe…
Ghost-chu Jan 22, 2025
694f91c
添加 DEBUG 子菜单
Ghost-chu Jan 22, 2025
8dee9ff
添加调试模式标记
Ghost-chu Jan 22, 2025
833825e
GUI 的各种更改
Ghost-chu Jan 22, 2025
aa0ce71
换成中文
Ghost-chu Jan 22, 2025
609747b
添加一个测试版关于窗口
Ghost-chu Jan 23, 2025
9bf7328
完成所有更改
Ghost-chu Jan 23, 2025
0071890
再改改
Ghost-chu Jan 23, 2025
97a9560
btn配置失败增加提示
Gaojianli Jan 24, 2025
17678ed
Update docker/build-push-action action to v6.13.0
renovate[bot] Jan 24, 2025
ec7f50c
再改改
Ghost-chu Jan 24, 2025
f4e5866
a little small tweaks
Ghost-chu Jan 24, 2025
e5dd9bb
a little small tweaks
Ghost-chu Jan 24, 2025
6313ad4
Update README.md
Ghost-chu Jan 25, 2025
ec17fe8
Merge branch 'refs/heads/about-gui' into dev
Ghost-chu Jan 25, 2025
b14d08b
防止用户搞砸 Docker 网络模式
Ghost-chu Jan 25, 2025
ff57b08
修改文本,让用户打开文档
Ghost-chu Jan 25, 2025
c313296
从 jar 内读取文件
Ghost-chu Jan 25, 2025
e891ffb
修正读取
Ghost-chu Jan 25, 2025
a26277e
修正读取
Ghost-chu Jan 25, 2025
6ffeca6
也支持 host 从开关参数读取
Ghost-chu Jan 25, 2025
65b48a8
支持开关参数
Ghost-chu Jan 25, 2025
8a6bd53
port 支持开关参数
Ghost-chu Jan 25, 2025
da0bcaa
添加 PACKAGING.md
Ghost-chu Jan 25, 2025
14affd5
Update PACKAGING.md
Ghost-chu Jan 25, 2025
5910b99
完善文本
Ghost-chu Jan 25, 2025
534cb7b
Merge remote-tracking branch 'origin/dev' into dev
Ghost-chu Jan 25, 2025
9c70304
菜单挪个位置
Ghost-chu Jan 25, 2025
45d5800
修正空指针启动问题
Ghost-chu Jan 25, 2025
282b1bd
检查 32-bit OS/JVM 发送兼容性警告
Ghost-chu Jan 25, 2025
0b3c084
更改提示信息
Ghost-chu Jan 25, 2025
67fda74
添加 x86(32-bit) 和 arm32-vfp-hflt 临终关怀
Ghost-chu Jan 25, 2025
c7f904b
beta1
Ghost-chu Jan 25, 2025
cdf0f24
默认关掉
Ghost-chu Jan 25, 2025
1c2e76e
移除 windows x86 支持,编译失败了
Ghost-chu Jan 25, 2025
5d24cbb
整点花活
Ghost-chu Jan 25, 2025
74f5d3e
修正目录
Ghost-chu Jan 25, 2025
a761fa6
Update src/main/java/com/ghostchu/peerbanhelper/gui/impl/swing/SwingP…
Ghost-chu Jan 25, 2025
c87f7c2
Update src/main/java/com/ghostchu/peerbanhelper/gui/impl/swing/theme/…
Ghost-chu Jan 25, 2025
d158f7e
Update src/main/java/com/ghostchu/peerbanhelper/gui/impl/swing/AboutW…
Ghost-chu Jan 25, 2025
ed60e71
听兔子的话
Ghost-chu Jan 25, 2025
ae7e0a2
Merge pull request #932 from PBH-BTN/dev
Ghost-chu Jan 25, 2025
f71a1a9
Merge pull request #931 from PBH-BTN/renovate/docker-build-push-actio…
Ghost-chu Jan 25, 2025
979f0c6
调整 buildkit 缓存策略
Ghost-chu Jan 25, 2025
d375378
改成 tar.gz 再试试
Ghost-chu Jan 25, 2025
a98c80d
Merge branch 'refs/heads/dev'
Ghost-chu Jan 25, 2025
4d36f61
Merge remote-tracking branch 'origin/master'
Ghost-chu Jan 25, 2025
6e82755
修一下 CI 脚本
Ghost-chu Jan 25, 2025
7661e4c
名字和 release ci 保持同步
Ghost-chu Jan 25, 2025
f4d9c44
修复 ci
Ghost-chu Jan 25, 2025
dec4390
继续修复 ci
Ghost-chu Jan 25, 2025
210f648
修复 ci
Ghost-chu Jan 25, 2025
00d0723
再修修
Ghost-chu Jan 25, 2025
8297019
fix ci
Ghost-chu Jan 25, 2025
79175de
缓存 spk 的 tarball
Ghost-chu Jan 25, 2025
e3fa76f
really? checkout
Ghost-chu Jan 25, 2025
3db9281
再修一下看看
Ghost-chu Jan 25, 2025
8747a35
再修一下看看
Ghost-chu Jan 25, 2025
3d9aef9
再修一下看看
Ghost-chu Jan 25, 2025
93f05dc
我就不信修不好你这个 CI 了
Ghost-chu Jan 25, 2025
b47ce4a
追加一个文件
Ghost-chu Jan 25, 2025
59e3dd6
fix ci
Ghost-chu Jan 25, 2025
c4d6565
fix web seed link
Ghost-chu Jan 25, 2025
86a0f14
向 release 工作流添加发布 torrent 的流程
Ghost-chu Jan 26, 2025
866abac
Bump org.jetbrains:annotations from 26.0.1 to 26.0.2
dependabot[bot] Jan 27, 2025
7310f8d
Bump dnsjava:dnsjava from 3.6.2 to 3.6.3
dependabot[bot] Jan 27, 2025
717fd03
Update webui/src/views/oobe/locale/en-US.ts
Ghost-chu Jan 27, 2025
92dfbf3
Merge pull request #937 from PBH-BTN/dependabot/maven/dnsjava-dnsjava…
Ghost-chu Jan 28, 2025
4ffd018
Merge pull request #936 from PBH-BTN/dependabot/maven/org.jetbrains-a…
Ghost-chu Jan 28, 2025
22e571f
向下载器提交封禁数据时按 IP 去重 #938
Ghost-chu Jan 28, 2025
76ff2d8
停止对 SPK 打包使用缓存
Ghost-chu Jan 28, 2025
1c16b69
允许通过 CLI 调试 JCEF 标记
Ghost-chu Jan 28, 2025
acd46d1
更换数据目录
Ghost-chu Jan 28, 2025
e459af9
切换到 StringJoiner
Ghost-chu Jan 28, 2025
ba1b435
降级 JCEF 版本以修复在 C: 中安装时 GPU 和 Network Service 崩溃的问题
Ghost-chu Jan 28, 2025
dae0c6b
JCEF 创建日志切换到 debug 等级
Ghost-chu Jan 28, 2025
54465e5
bump setup-install4j version
Ghost-chu Jan 28, 2025
e472cf9
update credit.txt
Ghost-chu Jan 28, 2025
c5f2c7f
修复 MacOS 主题不匹配的问题
Ghost-chu Jan 28, 2025
8283cbd
更新 install4j 文件
Ghost-chu Jan 28, 2025
d78a160
允许开关参数微调缓存参数
Ghost-chu Jan 28, 2025
41323df
开关参数允许调整最大日志数量
Ghost-chu Jan 28, 2025
58d155f
开关参数允许调整最大日志数量
Ghost-chu Jan 28, 2025
b591569
适配小内存模式
Ghost-chu Jan 28, 2025
5eb7c0a
注册开始菜单
Ghost-chu Jan 28, 2025
c62607e
final everything
Ghost-chu Jan 29, 2025
e26244f
final everything
Ghost-chu Jan 29, 2025
315fc85
恢复 install4j 编译配置
Ghost-chu Jan 29, 2025
096c79d
修复 pause 暂停字段不可为空的问题
Ghost-chu Jan 29, 2025
1924227
添加低内存模式启动变体
Ghost-chu Jan 29, 2025
4c04f14
更新到 168M Heap
Ghost-chu Jan 29, 2025
3ff598a
还原 pnpm-lock 更改
Ghost-chu Jan 29, 2025
f72ec17
prettier fix
Ghost-chu Jan 29, 2025
502a2a0
事务封禁日志写入实验
Ghost-chu Jan 29, 2025
2937b6a
外部同步块
Ghost-chu Jan 29, 2025
1fe732e
修复上传脚本
Ghost-chu Jan 29, 2025
d0410b4
Update README.md
Ghost-chu Jan 29, 2025
51374a8
Merge pull request #941 from PBH-BTN/Ghost-chu-patch-1
Ghost-chu Jan 29, 2025
85e16bb
收集 UNSUPPORTED 构建产物
Ghost-chu Jan 29, 2025
ddb4e8a
修复宣告节点
Ghost-chu Jan 29, 2025
9131b25
Merge remote-tracking branch 'origin/master'
Ghost-chu Jan 29, 2025
ebd148c
Update jvm-release.yml
Ghost-chu Jan 29, 2025
b1b591f
Update jvm-ci.yml
Ghost-chu Jan 29, 2025
428452d
默认对所有参与实验室的用户启用 SQLITE_VACUUM 和 DNSJAVA 实验
Ghost-chu Jan 29, 2025
0e5161a
beta2
Ghost-chu Jan 29, 2025
c06b6c9
fix ci (incorrect json token)
Ghost-chu Jan 29, 2025
775f3f8
fix sql error on startup
Ghost-chu Jan 29, 2025
595b475
去除导致异常的斜线
Ghost-chu Jan 30, 2025
da60f83
禁止为 Pre-Release 发布更新推送
Ghost-chu Jan 30, 2025
e0d5df8
修正 NAT 异常判定
Ghost-chu Jan 30, 2025
704acdb
只检查非握手数据传输的 Peer 的 NAT 状态
Ghost-chu Jan 30, 2025
283f19e
7.4.0 stable
Ghost-chu Jan 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_fe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 9.1.1
version: 10.0.0
coderabbitai[bot] marked this conversation as resolved.
Show resolved Hide resolved
run_install: false

- name: Get pnpm store directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: luangong/setup-install4j@v1
name: Setup Install4j
with:
version: 11.0.1
version: 11.0.2
license: ${{ secrets.INSTALL4J_LICENSE }}
- name: Make installers
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_spk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
name: spk-dist
path: |
/toolkit/build_env/ds.apollolake-7.2/image/packages/*.spk
!/toolkit/build_env/ds.apollolake-7.2/image/packages/*_debug.spk
!/toolkit/build_env/ds.apollolake-7.2/image/packages/*_debug.spk
90 changes: 80 additions & 10 deletions .github/workflows/jvm-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,96 @@ on:
push:
workflow_dispatch:
jobs:
CI:
Build_Executable:
uses: ./.github/workflows/build_maven.yml
secrets: inherit
Build_Installers:
needs: CI
needs: Build_Executable
uses: ./.github/workflows/build_installers.yml
secrets: inherit
Build_Portable:
needs: Build_Executable
uses: ./.github/workflows/build_portable.yml
Ghost-chu marked this conversation as resolved.
Show resolved Hide resolved
Build_SPK:
needs: CI
needs: Build_Executable
uses: ./.github/workflows/build_spk.yml
with:
image: ghostchu/peerbanhelper-snapshot:sha-$(git rev-parse --short ${{ github.sha }})
Build_DEB:
needs: CI
needs: Build_Executable
uses: ./.github/workflows/build_deb.yml
Build_PKG:
needs: CI
needs: Build_Executable
uses: ./.github/workflows/build_pkg.yml
Create_Torrent:
needs: [ Build_Executable, Build_Installers, Build_SPK, Build_DEB, Build_PKG, Build_Portable ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- id: java_info
uses: YunaBraska/java-info-action@main
# download artifacts
- uses: actions/download-artifact@v4
with:
name: maven-dist
path: target/
- uses: actions/download-artifact@v4
with:
name: installer-dist
path: target/media
- uses: actions/download-artifact@v4
with:
name: spk-dist
path: target/media
- uses: actions/download-artifact@v4
with:
name: deb-dist
path: target/media
- uses: actions/download-artifact@v4
with:
name: portable-dist
path: target/media
- uses: actions/download-artifact@v4
with:
name: freebsd-pkg-13.4-dist
path: target/media
- uses: actions/download-artifact@v4
with:
name: freebsd-pkg-14.1-dist
path: target/media
# create zip ball named PeerBanHelper_installers_${{ github.ref }}.zip with files inside target/media/
- name: Zip medias for create torrent
run: tar -zcvf PeerBanHelper_Installers.tar.gz target/media/
# prepare mktorrent util
- name: Install mktorrent
run: sudo apt-get install -y mktorrent
# make torrent
- name: Determine version
id: set_version
run: |
if [[ "${{ github.ref_type }}" == "tag" ]]; then
echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT
else
SHORT_SHA=$(git rev-parse --short "${{ github.sha }}")
echo "version=sha-$SHORT_SHA" >> $GITHUB_OUTPUT
fi
- name: Create copy of Installers archive
run: cp PeerBanHelper_Installers.tar.gz "PeerBanHelper_Installers_${{ steps.set_version.outputs.version }}.tar.gz"
- name: Make torrent
run: |
mktorrent -t 8 \
-a udp://tracker.opentrackr.org:1337/announce \
-a udp://tracker.publicbt.com:80/announce \
-a udp://tracker.openbittorrent.com:80/announce \
-a https://sparkle.ghostchu-services.top/announce \
-a udp://opentracker.io:6969/announce \
-a wss://tracker.openwebtorrent.com:443/announce \
-c "PeerBanHelper/${{ github.ref }} (${{ github.sha }}) on ${{ github.repository }}. Published by ${{ github.repository_owner }}." \
-w "https://github.com/${{ github.repository }}/releases/download/${{ steps.set_version.outputs.version }}/PeerBanHelper_Installers.tar.gz" \
-o peerbanhelper.torrent \
"PeerBanHelper_Installers_${{ steps.set_version.outputs.version }}.tar.gz"
Build_Docker:
needs: CI
needs: Build_Executable
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -63,7 +133,7 @@ jobs:
type=raw,ci
type=sha
- name: Build and push Docker image
uses: docker/build-push-action@v6.12.0
uses: docker/build-push-action@v6.13.0
with:
context: .
file: ./Dockerfile
Expand All @@ -74,7 +144,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}-jvm-universal
cache-from: type=gha
cache-to: type=gha,mode=max
cache-to: type=gha,mode=min
Build_Docker_Standalone:
runs-on: ubuntu-latest
steps:
Expand All @@ -98,7 +168,7 @@ jobs:
type=raw,ci
type=sha
- name: Build and push Docker image
uses: docker/build-push-action@v6.12.0
uses: docker/build-push-action@v6.13.0
with:
context: .
file: ./Dockerfile
Expand All @@ -109,4 +179,4 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}-jvm-universal
cache-from: type=gha
cache-to: type=gha,mode=max
cache-to: type=gha,mode=min
74 changes: 57 additions & 17 deletions .github/workflows/jvm-release.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Release

on:
workflow_dispatch:
release:
types:
- published

jobs:
Build_Executable:
permissions:
Expand All @@ -26,32 +19,41 @@ jobs:
statuses: read
secrets: inherit
uses: ./.github/workflows/build_maven.yml

Build_Installers:
needs: Build_Executable
uses: ./.github/workflows/build_installers.yml
secrets: inherit

Build_SPK:
needs: Build_Executable
uses: ./.github/workflows/build_spk.yml
with:
image: registry.cn-hangzhou.aliyuncs.com/ghostchu/peerbanhelper:${{ github.ref_name }}

Build_DEB:
needs: Build_Executable
uses: ./.github/workflows/build_deb.yml

Build_PKG:
needs: Build_Executable
uses: ./.github/workflows/build_pkg.yml

Build_Portable:
needs: Build_Executable
uses: ./.github/workflows/build_portable.yml

Empty_Old_S3_Files:
if: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
needs: [Build_Executable, Build_Installers, Build_SPK, Build_DEB, Build_PKG, Build_Portable]
uses: ./.github/workflows/delete_old_s3_objects.yml
secrets: inherit

Upload_Updates_To_S3:
needs: [Build_Executable, Build_Installers, Build_SPK, Build_DEB, Build_PKG, Build_Portable, Empty_Old_S3_Files]
runs-on: ubuntu-latest
steps:
if: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
needs: [ Build_Executable, Build_Installers, Build_SPK, Build_DEB, Build_PKG, Build_Portable, Empty_Old_S3_Files ]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: installer-dist
Expand All @@ -64,10 +66,13 @@ jobs:
endpoint: ${{ secrets.S3_ENDPOINT }}
source_dir: 'target/media'
destination_dir: 'updates/latest'

Clear_CloudFlare_Updates:
if: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
needs: [Upload_Updates_To_S3]
uses: ./.github/workflows/flush_cloudflare_cache.yml
secrets: inherit

Upload_Artifacts:
continue-on-error: true
if: github.event_name != 'workflow_dispatch'
Expand Down Expand Up @@ -111,11 +116,47 @@ jobs:
with:
name: freebsd-pkg-14.1-dist
path: target/media
- name: Zip medias for create torrent
run: tar -zcvf PeerBanHelper_Installers.tar.gz target/media/
- name: Install mktorrent
run: sudo apt-get install -y mktorrent
- name: Determine version
id: set_version
run: |
if [[ "${{ github.ref_type }}" == "tag" ]]; then
echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT
else
SHORT_SHA=$(git rev-parse --short "${{ github.sha }}")
echo "version=sha-$SHORT_SHA" >> $GITHUB_OUTPUT
fi
- name: Create copy of Installers archive
run: cp PeerBanHelper_Installers.tar.gz "PeerBanHelper_Installers_${{ steps.set_version.outputs.version }}.tar.gz"
- name: Make torrent
run: |
mktorrent -t 8 \
-a udp://tracker.opentrackr.org:1337/announce \
-a udp://tracker.publicbt.com:80/announce \
-a udp://tracker.openbittorrent.com:80/announce \
-a https://sparkle.ghostchu-services.top/announce \
-a udp://opentracker.io:6969/announce \
-a wss://tracker.openwebtorrent.com:443/announce \
-c "PeerBanHelper/${{ github.ref }} (${{ github.sha }}) on ${{ github.repository }}. Published by ${{ github.repository_owner }}." \
-w "https://github.com/${{ github.repository }}/releases/download/${{ steps.set_version.outputs.version }}/PeerBanHelper_Installers.tar.gz" \
-o peerbanhelper.torrent \
"PeerBanHelper_Installers_${{ steps.set_version.outputs.version }}.tar.gz"
- uses: actions/upload-artifact@v4
with:
name: torrent-dist
path: |
peerbanhelper.torrent
PeerBanHelper_Installers.tar.gz
id: project
- uses: alexellis/[email protected]
env:
GITHUB_TOKEN: ${{ github.token }}
with:
asset_paths: '["target/media/PeerBanHelper_*", "target/media/peerbanhelper_*", "target/media/peerbanhelper-*"]'
asset_paths: '["target/media/PeerBanHelper_*", "target/media/peerbanhelper_*", "target/media/peerbanhelper-*", "target/media/_____UNSUPPORTED_PeerBanHelper_*", "peerbanhelper.torrent", "PeerBanHelper_Installers.tar.gz"]'

Build_Docker:
if: github.event_name != 'workflow_dispatch'
permissions:
Expand Down Expand Up @@ -159,7 +200,7 @@ jobs:
type=raw,latest
type=sha
- name: Build and push Docker image
uses: docker/build-push-action@v6.12.0
uses: docker/build-push-action@v6.13.0
with:
context: .
file: ./Dockerfile
Expand All @@ -170,10 +211,9 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}-jvm-universal
cache-from: type=gha
cache-to: type=gha,mode=max
cache-to: type=gha,mode=min
build-args: |
GIT_HASH=${{ github.sha }}
# ---------------- ALIYUN ACR --------------------
- name: Log in to Aliyun ACR
uses: docker/login-action@v3
with:
Expand All @@ -195,7 +235,7 @@ jobs:
type=raw,latest
type=sha
- name: Build and push Aliyun ACR
uses: docker/build-push-action@v6.12.0
uses: docker/build-push-action@v6.13.0
with:
context: .
file: ./Dockerfile-Release
Expand All @@ -206,4 +246,4 @@ jobs:
tags: ${{ steps.meta-acr.outputs.tags }}
labels: ${{ steps.meta-acr.outputs.labels }}-jvm-universal
cache-from: type=gha
cache-to: type=gha,mode=max
cache-to: type=gha,mode=min
6 changes: 3 additions & 3 deletions .github/workflows/webui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: WebUI Build

on:
push:
branches: ["master"]
branches: ["master","dev"]
paths:
- "webui/**"
pull_request:
branches: ["master"]
branches: ["master","dev"]
paths:
- "webui/**"

Expand All @@ -30,7 +30,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 9.1.1
version: 10.0.0
run_install: false

- name: Get pnpm store directory
Expand Down
Loading
Loading