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.

Sign up for GitHub

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

Add real deb #484

Merged
merged 9 commits into from
Sep 16, 2024
Merged

Add real deb #484

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a55ef38
add deb package
Gaojianli Sep 16, 2024
7b31b95
add ci
Gaojianli Sep 16, 2024
e87dcf0
Merge remote-tracking branch 'origin/master' into deb
Gaojianli Sep 16, 2024
500a152
移除冒牌货
Gaojianli Sep 16, 2024
8667121
fix spk
Gaojianli Sep 16, 2024
6e584f1
fix build
Gaojianli Sep 16, 2024
170dca2
add config files
Gaojianli Sep 16, 2024
aa0700c
Merge remote-tracking branch 'origin/master' into deb
Gaojianli Sep 16, 2024
8505476
remove no need jar
Gaojianli Sep 16, 2024
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
28 changes: 27 additions & 1 deletion .github/workflows/jvm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,30 @@ jobs:
with:
name: synology-spk
path: |
/toolkit/build_env/ds.apollolake-7.2/image/packages/*.spk
/toolkit/build_env/ds.apollolake-7.2/image/packages/*.spk
Build_DEB:
needs: CI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- id: get-version
uses: jactions/[email protected]
- uses: actions/download-artifact@v4
with:
name: maven-dist
path: target/
- name: Set short git commit SHA
id: vars
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quote the variables in the shell script to prevent globbing and word splitting.

The static analysis tool has identified potential issues with unquoted variables in the shell script. To prevent unexpected behavior caused by globbing and word splitting, please quote the variables.

Apply this diff to fix the issues:

-          calculatedSha=$(git rev-parse --short ${{ github.sha }})
-          echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
+          calculatedSha=$(git rev-parse --short "${{ github.sha }}")
+          echo "COMMIT_SHORT_SHA=$calculatedSha" >> "$GITHUB_ENV"

Committable suggestion was skipped due to low confidence.

Tools
actionlint

103-103: shellcheck reported issue in this script: SC2086:info:2:43: Double quote to prevent globbing and word splitting

(shellcheck)

103-103: shellcheck reported issue in this script: SC2086:info:4:60: Double quote to prevent globbing and word splitting

(shellcheck)

run: |
calculatedSha=$(git rev-parse --short ${{ github.sha }})
echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
sed -i "s/<version>/${{ env.PBH_VERSION }}_$COMMIT_SHORT_SHA/g" pkg/deb/DEBIAN/control
cd pkg && dpkg -b deb peerbanhelper.${{ env.PBH_VERSION }}_$COMMIT_SHORT_SHA.deb
env:
PBH_VERSION: ${{ steps.get-version.outputs.version }}
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: deb
path: |
pkg/*.deb
2 changes: 1 addition & 1 deletion .github/workflows/jvm-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
calculatedSha=$(git rev-parse --short ${{ github.sha }})
echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
- name: Run build script
run: sudo PBH_VERSION=${{ env.PBH_VERSION }} IMAGE=${{ env.IMAGE }} bash synopkg/build-script.sh
run: sudo PBH_VERSION=${{ env.PBH_VERSION }} IMAGE=${{ env.IMAGE }} bash pkg/synopkg/build-script.sh
env:
PBH_VERSION: ${{ steps.get-version.outputs.version }}
IMAGE: ghostchu/peerbanhelper-snapshot:sha-${{ env.COMMIT_SHORT_SHA }}
Expand Down
1 change: 1 addition & 0 deletions pkg/deb/DEBIAN/conffiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/peerbanhelper/
8 changes: 8 additions & 0 deletions pkg/deb/DEBIAN/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Package: peerbanhelper
Version: <version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace the placeholder version with the actual version number.

The Version field currently uses a placeholder <version>. Please replace it with the actual version number of the package before building the Debian package.

Depends: java-runtime (>=21)
Section: universe/net
Priority: optional
Architecture: all
Maintainer: Ghost_chu
Description: PeerBanHelper is a tool to auto ban peers on the bitorrent network
1 change: 1 addition & 0 deletions pkg/deb/DEBIAN/dirs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/peerbanhelper
5 changes: 5 additions & 0 deletions pkg/deb/DEBIAN/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
USER=peerbanhelper
adduser --system $USER
mkdir -p /etc/peerbanhelper
chown $USER /etc/peerbanhelper
Binary file added pkg/deb/usr/lib/peerbanhelper/PeerBanHelper.jar
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions pkg/deb/usr/lib/systemd/system/peerbanhelper.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Unit]
Description=PeerBanHelper Service
After=network.target
[Service]
User=peerbanhelper
WorkingDirectory=/etc/peerbanhelper
ExecStart=/usr/bin/java -Xmx386M -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -jar /usr/lib/peerbanhelper/PeerBanHelper.jar
Restart=on-failure
[Install]
WantedBy=multi-user.target

0 synopkg/PeerBanHelperPackage/INFO.sh → pkg/synopkg/PeerBanHelperPackage/INFO.sh
View file
Open in desktop
File renamed without changes.
0 synopkg/PeerBanHelperPackage/LICENSE → pkg/synopkg/PeerBanHelperPackage/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...pkg/PeerBanHelperPackage/PACKAGE_ICON.PNG → ...pkg/PeerBanHelperPackage/PACKAGE_ICON.PNG
View file
Open in desktop
File renamed without changes
0 ...PeerBanHelperPackage/PACKAGE_ICON_256.PNG → ...PeerBanHelperPackage/PACKAGE_ICON_256.PNG
View file
Open in desktop
File renamed without changes
0 synopkg/PeerBanHelperPackage/README.md → pkg/synopkg/PeerBanHelperPackage/README.md
View file
Open in desktop
File renamed without changes.
0 .../PeerBanHelperPackage/SynoBuildConf/build → .../PeerBanHelperPackage/SynoBuildConf/build
View file
Open in desktop
File renamed without changes.
0 ...eerBanHelperPackage/SynoBuildConf/depends → ...eerBanHelperPackage/SynoBuildConf/depends
View file
Open in desktop
File renamed without changes.
0 ...eerBanHelperPackage/SynoBuildConf/install → ...eerBanHelperPackage/SynoBuildConf/install
View file
Open in desktop
File renamed without changes.
0 ...lperPackage/WIZARD_UIFILES/install_uifile → ...lperPackage/WIZARD_UIFILES/install_uifile
View file
Open in desktop
File renamed without changes.
0 synopkg/PeerBanHelperPackage/conf/privilege → ...nopkg/PeerBanHelperPackage/conf/privilege
View file
Open in desktop
File renamed without changes.
0 synopkg/PeerBanHelperPackage/conf/resource → ...ynopkg/PeerBanHelperPackage/conf/resource
View file
Open in desktop
File renamed without changes.
0 ...rBanHelperPackage/etc/installer-variables → ...rBanHelperPackage/etc/installer-variables
View file
Open in desktop
File renamed without changes.
0 ...kg/PeerBanHelperPackage/scripts/functions → ...kg/PeerBanHelperPackage/scripts/functions
View file
Open in desktop
File renamed without changes.
0 ...kg/PeerBanHelperPackage/scripts/installer → ...kg/PeerBanHelperPackage/scripts/installer
View file
Open in desktop
File renamed without changes.
0 ...pkg/PeerBanHelperPackage/scripts/postinst → ...pkg/PeerBanHelperPackage/scripts/postinst
View file
Open in desktop
File renamed without changes.
0 ...g/PeerBanHelperPackage/scripts/postuninst → ...g/PeerBanHelperPackage/scripts/postuninst
View file
Open in desktop
File renamed without changes.
0 .../PeerBanHelperPackage/scripts/postupgrade → .../PeerBanHelperPackage/scripts/postupgrade
View file
Open in desktop
File renamed without changes.
0 synopkg/PeerBanHelperPackage/scripts/preinst → ...opkg/PeerBanHelperPackage/scripts/preinst
View file
Open in desktop
File renamed without changes.
0 ...kg/PeerBanHelperPackage/scripts/preuninst → ...kg/PeerBanHelperPackage/scripts/preuninst
View file
Open in desktop
File renamed without changes.
0 ...g/PeerBanHelperPackage/scripts/preupgrade → ...g/PeerBanHelperPackage/scripts/preupgrade
View file
Open in desktop
File renamed without changes.
0 ...eerBanHelperPackage/scripts/service-setup → ...eerBanHelperPackage/scripts/service-setup
View file
Open in desktop
File renamed without changes.
0 ...anHelperPackage/scripts/start-stop-status → ...anHelperPackage/scripts/start-stop-status
View file
Open in desktop
File renamed without changes.
0 ...perPackage/target/app/docker-compose.yaml → ...perPackage/target/app/docker-compose.yaml
View file
Open in desktop
File renamed without changes.
0 ...pkg/PeerBanHelperPackage/target/ui/config → ...pkg/PeerBanHelperPackage/target/ui/config
View file
Open in desktop
File renamed without changes.
0 ...BanHelperPackage/target/ui/images/128.png → ...BanHelperPackage/target/ui/images/128.png
View file
Open in desktop
File renamed without changes
0 ...rBanHelperPackage/target/ui/images/16.png → ...rBanHelperPackage/target/ui/images/16.png
View file
Open in desktop
File renamed without changes
0 ...rBanHelperPackage/target/ui/images/24.png → ...rBanHelperPackage/target/ui/images/24.png
View file
Open in desktop
File renamed without changes
0 ...BanHelperPackage/target/ui/images/256.png → ...BanHelperPackage/target/ui/images/256.png
View file
Open in desktop
File renamed without changes
0 ...rBanHelperPackage/target/ui/images/32.png → ...rBanHelperPackage/target/ui/images/32.png
View file
Open in desktop
File renamed without changes
0 ...rBanHelperPackage/target/ui/images/48.png → ...rBanHelperPackage/target/ui/images/48.png
View file
Open in desktop
File renamed without changes
0 ...rBanHelperPackage/target/ui/images/64.png → ...rBanHelperPackage/target/ui/images/64.png
View file
Open in desktop
File renamed without changes
0 ...rBanHelperPackage/target/ui/images/72.png → ...rBanHelperPackage/target/ui/images/72.png
View file
Open in desktop
File renamed without changes
0 ...rBanHelperPackage/target/ui/images/96.png → ...rBanHelperPackage/target/ui/images/96.png
View file
Open in desktop
File renamed without changes
0 ...HelperPackage/target/ui/texts/cht/strings → ...HelperPackage/target/ui/texts/cht/strings
View file
Open in desktop
File renamed without changes.
0 ...HelperPackage/target/ui/texts/enu/strings → ...HelperPackage/target/ui/texts/enu/strings
View file
Open in desktop
File renamed without changes.
0 synopkg/build-script.sh → pkg/synopkg/build-script.sh
View file
Open in desktop
File renamed without changes.
Loading