Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"

# mips{,el}-unknown-linux-gnu: the old glibc in the cross-toolchain lacks the
# `getrandom()` wrapper symbol that getrandom 0.3's default backend calls, so we
# select getrandom's `custom` backend (implemented via the raw SYS_getrandom
# syscall in privaxy's lib.rs). musl MIPS uses getrandom's weak-fallback backend
# and needs no override.
[target.mips-unknown-linux-gnu]
rustflags = ["--cfg", "getrandom_backend=\"custom\""]

[target.mipsel-unknown-linux-gnu]
linker = "mipsel-linux-gnu-gcc"
rustflags = ["--cfg", "getrandom_backend=\"custom\""]

[target.mipsel-unknown-linux-musl]
linker = "mipsel-linux-musl-gcc"
16 changes: 13 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,9 @@ jobs:
- name: Build packages
if: ${{ !endsWith(matrix.target, '-musl') }}
run: |
# target/ is cached; discard packages from previous versions.
rm -f target/${{ matrix.target }}/release/privaxy_*.deb \
target/${{ matrix.target }}/release/privaxy-*.rpm
cargo install cargo-deb && cargo deb -p privaxy --target ${{ matrix.target }} -o target/${{ matrix.target }}/release
cargo install cargo-generate-rpm && cargo generate-rpm -p privaxy --target ${{ matrix.target }} -o target/${{ matrix.target }}/release
- uses: actions/upload-artifact@v4
Expand All @@ -366,7 +369,7 @@ jobs:
if: ${{ !endsWith(matrix.target, '-musl') }}
with:
name: privaxy-rpm-${{ matrix.target }}
path: target/${{ matrix.target }}/release/*.rpm
path: target/${{ matrix.target }}/release/privaxy-*.rpm
- uses: actions/upload-artifact@v4
with:
name: privaxy-${{ matrix.target }}
Expand Down Expand Up @@ -432,6 +435,9 @@ jobs:
- name: Build packages
if: ${{ endsWith(matrix.target, '-linux-gnu') }}
run: |
# target/ is cached; discard packages from previous versions.
rm -f target/${{ matrix.target }}/release/privaxy_*.deb \
target/${{ matrix.target }}/release/privaxy-*.rpm
variant=$(echo "${{ matrix.target }}" | cut -d- -f1)
cargo install cargo-deb && cargo deb --no-build --no-strip --variant "$variant" -p privaxy --target ${{ matrix.target }} -o target/${{ matrix.target }}/release
cargo install cargo-generate-rpm && cargo generate-rpm -p privaxy --target ${{ matrix.target }} -o target/${{ matrix.target }}/release
Expand All @@ -446,7 +452,7 @@ jobs:
if: ${{ endsWith(matrix.target, '-linux-gnu') }}
with:
name: privaxy-rpm-${{ matrix.target }}
path: target/${{ matrix.target }}/release/*.rpm
path: target/${{ matrix.target }}/release/privaxy-*.rpm

- uses: actions/upload-artifact@v4
with:
Expand All @@ -462,6 +468,9 @@ jobs:
permissions:
contents: write
steps:
- name: Checkout release notes
uses: actions/checkout@v6

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
Expand All @@ -485,6 +494,7 @@ jobs:
- name: Create release
uses: softprops/action-gh-release@v2
with:
body_path: RELEASE.md
files: ./release-assets/*
generate_release_notes: true
fail_on_unmatched_files: true
fail_on_unmatched_files: true
345 changes: 345 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading
Loading