Skip to content

Commit 824f681

Browse files
authored
Merge branch 'master' into feat/torrent-details-bottom-panel
2 parents 9dfb314 + 7945a40 commit 824f681

32 files changed

Lines changed: 961 additions & 201 deletions

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
2929
apt-get install -y --no-install-recommends nodejs && \
3030
rm -rf /var/lib/apt/lists/*
3131

32-
# Install pnpm 9.7.0
33-
RUN npm install -g pnpm@9.7.0
32+
# Install pnpm 11.5.2
33+
RUN npm install -g pnpm@11.5.2
3434

3535
# Install rTorrent from jesec's releases (same as CI)
3636
RUN wget -q https://github.com/jesec/rtorrent/releases/latest/download/rtorrent-linux-amd64.deb && \

.devcontainer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The dev container image is automatically built and published to GitHub Container
3636

3737
- **OS:** Ubuntu 22.04 LTS (jammy)
3838
- **Node.js:** v22.x (matches CI and production targets)
39-
- **Package Manager:** pnpm 9.7.0
39+
- **Package Manager:** pnpm 11.5.2
4040
- **Shell:** zsh with Oh My Zsh
4141

4242
### Development Tools

.github/workflows/build-binary.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
tar -xzf "${{ steps.package.outputs.tarball }}" -C package --strip-components=1
6060
cp pnpm-lock.yaml package/
6161
62-
- uses: pnpm/action-setup@v4
62+
- uses: pnpm/action-setup@v6
6363

6464
- name: Use Node.js
6565
uses: actions/setup-node@v4
@@ -83,7 +83,7 @@ jobs:
8383
sudo chmod +x /usr/local/bin/ldid
8484
8585
- name: Install pkg
86-
run: pnpm add -g @yao-pkg/pkg
86+
run: pnpm add -g --config.global-bin-dir="$PNPM_HOME" @yao-pkg/pkg
8787

8888
- name: Build executables
8989
working-directory: package

.github/workflows/build-debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
sudo apt-get update -y
3838
sudo apt-get install --reinstall -y qemu-user-static
3939
40-
- run: pnpm add -g @yao-pkg/pkg
40+
- run: pnpm add -g --config.global-bin-dir="$PNPM_HOME" @yao-pkg/pkg
4141

4242
- name: Install Bazel
4343
run: |

.github/workflows/build-docker-distroless.yml

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,6 @@ on:
3232
required: false
3333
default: jesec/flood
3434
type: string
35-
build-rtorrent:
36-
description: Whether to build rtorrent-flood distroless image
37-
required: false
38-
default: true
39-
type: boolean
40-
rtorrent-tags:
41-
description: Docker tags for the rtorrent-flood distroless image (newline separated)
42-
required: false
43-
default: jesec/rtorrent-flood:dev-distroless
44-
type: string
45-
rtorrent-version:
46-
description: rtorrent version used for local tag only
47-
required: false
48-
default: master
49-
type: string
50-
rtorrent-image:
51-
description: Full image reference for rtorrent base
52-
required: false
53-
default: docker.io/jesec/rtorrent:master
54-
type: string
5535

5636
jobs:
5737
docker:
@@ -80,7 +60,6 @@ jobs:
8060
id: local
8161
run: |
8262
printf 'flood=%s\n' "${LOCAL_REGISTRY}/${{ inputs['flood-repository'] }}:${{ inputs['flood-version'] }}-distroless" >> "$GITHUB_OUTPUT"
83-
printf 'rtorrent=%s\n' "${LOCAL_REGISTRY}/rtorrent-flood:${{ inputs['rtorrent-version'] }}-distroless" >> "$GITHUB_OUTPUT"
8463
8564
- name: Set up QEMU
8665
uses: docker/setup-qemu-action@v3
@@ -134,28 +113,3 @@ jobs:
134113
[ -z "$tag" ] && continue
135114
regctl image copy "$LOCAL_TAG" "$tag"
136115
done <<< "${{ inputs['flood-tags'] }}"
137-
138-
- name: Build rtorrent-flood distroless image
139-
if: inputs.build-rtorrent
140-
id: build_rtorrent
141-
uses: docker/build-push-action@v5
142-
with:
143-
context: .
144-
file: ./distribution/containers/Dockerfile.distroless
145-
target: rtorrent-flood
146-
platforms: ${{ inputs.platforms }}
147-
push: true
148-
pull: false
149-
tags: ${{ steps.local.outputs.rtorrent }}
150-
build-args: |
151-
RTORRENT_IMAGE=${{ inputs['rtorrent-image'] }}
152-
153-
- name: Mirror rtorrent-flood distroless image to targets
154-
if: inputs.push && inputs.build-rtorrent
155-
env:
156-
LOCAL_TAG: ${{ steps.local.outputs.rtorrent }}
157-
run: |
158-
while IFS= read -r tag; do
159-
[ -z "$tag" ] && continue
160-
regctl image copy "$LOCAL_TAG" "$tag"
161-
done <<< "${{ inputs['rtorrent-tags'] }}"

.github/workflows/build-docker.yml

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -42,36 +42,6 @@ on:
4242
required: false
4343
default: jesec/flood
4444
type: string
45-
build-rtorrent:
46-
description: Whether to build rtorrent-flood image
47-
required: false
48-
default: true
49-
type: boolean
50-
rtorrent-tags:
51-
description: Docker tags for the rtorrent-flood image (newline separated)
52-
required: false
53-
default: jesec/rtorrent-flood:dev
54-
type: string
55-
rtorrent-version:
56-
description: rtorrent version to embed
57-
required: false
58-
default: master
59-
type: string
60-
rtorrent-registry:
61-
description: Registry host for rtorrent base image
62-
required: false
63-
default: docker.io
64-
type: string
65-
rtorrent-repository:
66-
description: Repository path for rtorrent base image
67-
required: false
68-
default: jesec/rtorrent
69-
type: string
70-
rtorrent-image:
71-
description: Full image reference for rtorrent base
72-
required: false
73-
default: docker.io/jesec/rtorrent:master
74-
type: string
7545

7646
jobs:
7747
docker:
@@ -103,7 +73,6 @@ jobs:
10373
id: local
10474
run: |
10575
printf 'flood=%s\n' "${LOCAL_REGISTRY}/${{ inputs['flood-repository'] }}:${{ inputs['flood-version'] }}" >> "$GITHUB_OUTPUT"
106-
printf 'rtorrent=%s\n' "${LOCAL_REGISTRY}/rtorrent-flood:${{ inputs['rtorrent-version'] }}" >> "$GITHUB_OUTPUT"
10776
10877
- name: Set up QEMU
10978
uses: docker/setup-qemu-action@v3
@@ -162,29 +131,3 @@ jobs:
162131
[ -z "$tag" ] && continue
163132
regctl image copy "$LOCAL_TAG" "$tag"
164133
done <<< "${{ inputs['flood-tags'] }}"
165-
166-
- name: Build rtorrent-flood image
167-
if: inputs.build-rtorrent
168-
id: build_rtorrent
169-
uses: docker/build-push-action@v5
170-
with:
171-
context: .
172-
file: ./distribution/containers/Dockerfile.rtorrent
173-
platforms: ${{ inputs.platforms }}
174-
push: true
175-
pull: false
176-
network: host
177-
tags: ${{ steps.local.outputs.rtorrent }}
178-
build-args: |
179-
FLOOD_IMAGE=${{ steps.local.outputs.flood }}
180-
RTORRENT_IMAGE=${{ inputs['rtorrent-image'] }}
181-
182-
- name: Mirror rtorrent-flood image to targets
183-
if: inputs.push && inputs.build-rtorrent
184-
env:
185-
LOCAL_TAG: ${{ steps.local.outputs.rtorrent }}
186-
run: |
187-
while IFS= read -r tag; do
188-
[ -z "$tag" ] && continue
189-
regctl image copy "$LOCAL_TAG" "$tag"
190-
done <<< "${{ inputs['rtorrent-tags'] }}"

.github/workflows/build.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
flood-version: pr-${{ github.event.pull_request.number || 'check' }}
2121
flood-tags: |
2222
jesec/flood:pr-${{ github.event.pull_request.number || 'check' }}
23-
rtorrent-tags: |
24-
jesec/rtorrent-flood:pr-validate
2523
platforms: linux/amd64,linux/arm64
2624

2725
pkg:
@@ -39,8 +37,6 @@ jobs:
3937
flood-version: pr-${{ github.event.pull_request.number || 'check' }}
4038
flood-tags: |
4139
jesec/flood:pr-${{ github.event.pull_request.number || 'check' }}-distroless
42-
rtorrent-tags: |
43-
jesec/rtorrent-flood:pr-${{ github.event.pull_request.number || 'check' }}-distroless
4440
platforms: linux/amd64,linux/arm64
4541

4642
debian:
@@ -54,5 +50,21 @@ jobs:
5450
- docker
5551
- docker-distroless
5652
- debian
53+
if: always()
5754
steps:
58-
- run: echo 1
55+
- run: |
56+
if [[ "${{ needs.pkg.result }}" != "success" ]]; then
57+
exit 1
58+
fi
59+
- run: |
60+
if [[ "${{ needs.docker.result }}" != "success" ]]; then
61+
exit 1
62+
fi
63+
- run: |
64+
if [[ "${{ needs.docker-distroless.result }}" != "success" ]]; then
65+
exit 1
66+
fi
67+
- run: |
68+
if [[ "${{ needs.debian.result }}" != "success" ]]; then
69+
exit 1
70+
fi

.github/workflows/publish-rolling.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
- uses: pnpm/action-setup@v4
4949
with:
50-
version: 9
50+
version: latest
5151

5252
- name: Exchange OIDC token for npm publish token
5353
id: npm_token
@@ -89,11 +89,6 @@ jobs:
8989
flood-tags: |
9090
jesec/flood:master
9191
ghcr.io/jesec/flood:master
92-
build-rtorrent: true
93-
rtorrent-version: master
94-
rtorrent-tags: |
95-
jesec/rtorrent-flood:master
96-
ghcr.io/jesec/rtorrent-flood:master
9792
9893
pkg:
9994
needs: package
@@ -113,8 +108,3 @@ jobs:
113108
flood-tags: |
114109
jesec/flood:master-distroless
115110
ghcr.io/jesec/flood:master-distroless
116-
build-rtorrent: true
117-
rtorrent-version: master
118-
rtorrent-tags: |
119-
jesec/rtorrent-flood:master-distroless
120-
ghcr.io/jesec/rtorrent-flood:master-distroless

.github/workflows/release.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: pnpm/action-setup@v4
3636
with:
37-
version: 9
37+
version: latest
3838

3939
- name: Exchange OIDC token for npm publish token
4040
id: npm_token
@@ -86,13 +86,6 @@ jobs:
8686
jesec/flood:${{ needs.package.outputs.version }}
8787
ghcr.io/jesec/flood:latest
8888
ghcr.io/jesec/flood:${{ needs.package.outputs.version }}
89-
build-rtorrent: true
90-
rtorrent-version: master
91-
rtorrent-tags: |
92-
jesec/rtorrent-flood:${{ needs.package.outputs.version }}
93-
jesec/rtorrent-flood:latest
94-
ghcr.io/jesec/rtorrent-flood:${{ needs.package.outputs.version }}
95-
ghcr.io/jesec/rtorrent-flood:latest
9689
9790
github-release:
9891
needs:

.github/workflows/test-backend.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ jobs:
3535
mv /tmp/x86_64-qbittorrent-nox /usr/local/bin/qbittorrent-nox
3636
chmod +x /usr/local/bin/qbittorrent-nox
3737
38-
- run: sudo apt-get install -y transmission-daemon
38+
- run: |
39+
sudo apt-get update
40+
sudo apt-get install -y transmission-daemon
3941
4042
- run: |
4143
wget https://github.com/jesec/rtorrent/releases/latest/download/rtorrent-linux-amd64.deb

0 commit comments

Comments
 (0)