Skip to content

Commit 0920a64

Browse files
committed
Merge remote-tracking branch 'origin/develop' into fix/cloud-rename-sidecar
2 parents 5da8974 + bebdc2b commit 0920a64

22 files changed

Lines changed: 3017 additions & 331 deletions

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [main, develop]
66
pull_request:
7-
branches: [main]
7+
branches: [main, develop]
88

99
jobs:
1010
lint:
@@ -98,7 +98,8 @@ jobs:
9898
release-check:
9999
name: Release Check
100100
runs-on: ubuntu-latest
101-
if: github.event_name == 'pull_request'
101+
# Only relevant for release PRs (develop -> main); skip on PRs into develop.
102+
if: github.event_name == 'pull_request' && github.base_ref == 'main'
102103
steps:
103104
- uses: actions/checkout@v4
104105
with:

.github/workflows/pr-target-guard.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ on:
44
pull_request_target:
55
types: [opened, reopened, synchronize]
66

7+
permissions:
8+
pull-requests: write
9+
contents: read
10+
711
jobs:
8-
# Block any PR to main that doesn't come from develop
12+
# Block any PR to main that doesn't come from develop (non-fork branches only;
13+
# forks are handled by redirect-forks below to avoid a duplicate message).
914
require-develop-to-main:
1015
runs-on: ubuntu-latest
11-
if: github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref != 'develop'
16+
if: github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref != 'develop' && !github.event.pull_request.head.repo.fork
1217
steps:
1318
- name: Block non-develop PRs to main
1419
run: |

.github/workflows/release.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ jobs:
1010
release:
1111
name: Release
1212
runs-on: ubuntu-latest
13+
# The repo's default workflow token is read-only, so without this the job 403s
14+
# when pushing the tag / creating the release (releases had to be made by hand).
15+
permissions:
16+
contents: write
1317
steps:
1418
- uses: actions/checkout@v4
1519
with:
@@ -55,8 +59,15 @@ jobs:
5559
id: release_notes
5660
run: |
5761
VERSION="${{ steps.version_check.outputs.current_version }}"
58-
# Extract content between this version header and the next version header
59-
NOTES=$(awk "/^## $VERSION/,/^## \[?[0-9]/" CHANGELOG.md | head -n -1 | tail -n +2)
62+
# Print the body between this version's header and the next version header,
63+
# excluding both headers. Handles both "## 1.2.3" and "## [1.2.3]" styles.
64+
# (The old awk range failed because its end pattern also matched the start
65+
# header, collapsing the range to a single line — release notes were empty.)
66+
NOTES=$(awk -v ver="$VERSION" '
67+
$0 ~ "^## \\[?" ver "([^0-9]|$)" { collecting = 1; next }
68+
collecting && /^## \[?[0-9]/ { exit }
69+
collecting { print }
70+
' CHANGELOG.md)
6071
# Use a delimiter for multiline output
6172
echo "notes<<EOF" >> $GITHUB_OUTPUT
6273
echo "$NOTES" >> $GITHUB_OUTPUT

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [1.7.4] - 2026-06-30
4+
5+
### Added
6+
7+
- Horizontal panning with wheel and touchpad (thanks @binaryBrandon)
8+
- MEGA two-factor authentication (2FA) login
9+
- Uploaded covers now show thumbnails in MEGA
10+
11+
### Changed
12+
13+
- MEGA support no longer held together with hope and duct tape
14+
- Faster MEGA downloads
15+
316
## [1.7.3] - 2026-06-14
417

518
### Fixed

0 commit comments

Comments
 (0)