Skip to content

Commit

Permalink
Merge pull request #3126 from mikiher/pkg-replacement
Browse files Browse the repository at this point in the history
Replace pkg with @yao-pkg/pkg and target node20
  • Loading branch information
advplyr authored Jul 6, 2024
2 parents 3a2f786 + 928b080 commit 1e5787c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches-ignore:
- 'dependabot/**' # Don't run dependabot branches, as they are already covered by pull requests
- 'dependabot/**' # Don't run dependabot branches, as they are already covered by pull requests

jobs:
build:
Expand All @@ -18,8 +18,8 @@ jobs:
with:
node-version: 20

- name: install pkg
run: npm install -g pkg
- name: install pkg (using yao-pkg fork for targetting node20)
run: npm install -g @yao-pkg/pkg

- name: get client dependencies
working-directory: client
Expand All @@ -33,7 +33,7 @@ jobs:
run: npm ci --only=production

- name: build binary
run: pkg -t node18-linux-x64 -o audiobookshelf .
run: pkg -t node20-linux-x64 -o audiobookshelf .

- name: run audiobookshelf
run: |
Expand Down
2 changes: 1 addition & 1 deletion build/linuxpackager
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Description: $DESCRIPTION"
echo "$controlfile" > dist/debian/DEBIAN/control;

# Package debian
pkg -t node18-linux-x64 -o dist/debian/usr/share/audiobookshelf/audiobookshelf .
pkg -t node20-linux-x64 -o dist/debian/usr/share/audiobookshelf/audiobookshelf .

fakeroot dpkg-deb -Zxz --build dist/debian

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start": "node index.js",
"client": "cd client && npm ci && npm run generate",
"prod": "npm run client && npm ci && node prod.js",
"build-win": "npm run client && pkg -t node18-win-x64 -o ./dist/win/audiobookshelf -C GZip .",
"build-win": "npm run client && pkg -t node20-win-x64 -o ./dist/win/audiobookshelf -C GZip .",
"build-linux": "build/linuxpackager",
"docker": "docker buildx build --platform linux/amd64,linux/arm64 --push . -t advplyr/audiobookshelf",
"docker-amd64-local": "docker buildx build --platform linux/amd64 --load . -t advplyr/audiobookshelf-amd64-local",
Expand Down
1 change: 1 addition & 0 deletions server/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ class Server {
*/
async init() {
Logger.info('[Server] Init v' + version)
Logger.info('[Server] Node.js Version:', process.version)

await this.playbackSessionManager.removeOrphanStreams()

Expand Down

0 comments on commit 1e5787c

Please sign in to comment.