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
61 changes: 0 additions & 61 deletions .github/workflows/publish.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
name: Release

on:
push:
tags:
- "v*"

env:
CARGO_TERM_COLOR: always

jobs:
# Run all tests first using the reusable workflow
tests:
uses: ./.github/workflows/tests.yml

# Build binaries for different platforms
build-binaries:
name: Build ${{ matrix.target }}
needs: tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-x86_64
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-aarch64
- target: x86_64-apple-darwin
os: macos-13-large
name: macos-x86_64
- target: aarch64-apple-darwin
os: macos-14-xlarge
name: macos-aarch64

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ matrix.target }}

- name: Install cross-compilation tools for ARM64 Linux
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV

- name: Build binary
run: cargo build --release --target ${{ matrix.target }}

- name: Create tarball
run: |
# Get version from tag
VERSION=${GITHUB_REF_NAME#v}

# Create directory structure
mkdir -p httpjail-${VERSION}-${{ matrix.name }}

# Copy binary
cp target/${{ matrix.target }}/release/httpjail httpjail-${VERSION}-${{ matrix.name }}/

# Copy README and LICENSE if they exist
[ -f README.md ] && cp README.md httpjail-${VERSION}-${{ matrix.name }}/
[ -f LICENSE ] && cp LICENSE httpjail-${VERSION}-${{ matrix.name }}/

# Create tarball
tar czf httpjail-${VERSION}-${{ matrix.name }}.tar.gz httpjail-${VERSION}-${{ matrix.name }}

# Output path for upload
echo "ASSET_PATH=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
echo "ASSET_NAME=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: binary-${{ matrix.name }}
path: ${{ env.ASSET_PATH }}
retention-days: 1

# Create release and publish to crates.io
release:
name: Create Release and Publish
needs: build-binaries
runs-on: ubuntu-latest-16-cores
environment: publish
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Need full history for changelog

- name: Check if test release
id: check_test
run: |
if [[ "${{ github.ref_name }}" == *-test ]]; then
echo "is_test=true" >> $GITHUB_OUTPUT
echo "This is a test release"
else
echo "is_test=false" >> $GITHUB_OUTPUT
echo "This is a production release"
fi

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}

- name: Verify version matches tag
if: steps.check_test.outputs.is_test == 'false'
run: |
# Extract version from Cargo.toml
CARGO_VERSION=$(grep -E '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')

# Get the git tag without the 'v' prefix
TAG_VERSION=${GITHUB_REF_NAME#v}

echo "Cargo.toml version: $CARGO_VERSION"
echo "Git tag version: $TAG_VERSION"

if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
echo "Error: Version mismatch!"
echo "Cargo.toml has version $CARGO_VERSION but git tag is $GITHUB_REF_NAME"
exit 1
fi

echo "Version check passed!"

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Generate changelog
id: changelog
run: |
# Get the current tag
CURRENT_TAG="${GITHUB_REF_NAME}"

# Get the previous tag
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^ 2>/dev/null || echo "")

# Generate changelog
if [ -z "$PREVIOUS_TAG" ]; then
echo "First release!"
CHANGELOG="Initial release of httpjail"
else
echo "Generating changelog from $PREVIOUS_TAG to $CURRENT_TAG"

# Get commit messages between tags
CHANGELOG=$(git log --pretty=format:"- %s (%h)" ${PREVIOUS_TAG}..${CURRENT_TAG})
fi

# Save to file for release body
if [[ "${{ github.ref_name }}" == *-test ]]; then
TEST_WARNING="## ⚠️ TEST RELEASE\n\nThis is a test release for validation purposes. Please use official releases for production.\n\n"
else
TEST_WARNING=""
fi

cat > RELEASE_NOTES.md << EOF
${TEST_WARNING}## What's Changed

$CHANGELOG

## Installation

Download the appropriate tarball for your platform, extract it, and place the binary in your PATH:

\`\`\`bash
tar xzf httpjail-*.tar.gz
sudo mv httpjail-*/httpjail /usr/local/bin/
# on macOS, you may need to run:
# xattr -d com.apple.quarantine httpjail-*/httpjail
# before the system allows you execute it.
\`\`\`

Or install from crates.io:

\`\`\`bash
cargo install httpjail
\`\`\`
EOF

echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
files: artifacts/**/*.tar.gz
draft: ${{ steps.check_test.outputs.is_test == 'true' }}
prerelease: ${{ steps.check_test.outputs.is_test == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to crates.io
if: steps.check_test.outputs.is_test == 'false'
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
61 changes: 0 additions & 61 deletions .github/workflows/publish.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
name: Release

on:
push:
tags:
- "v*"

env:
CARGO_TERM_COLOR: always

jobs:
# Run all tests first using the reusable workflow
tests:
uses: ./.github/workflows/tests.yml

# Build binaries for different platforms
build-binaries:
name: Build ${{ matrix.target }}
needs: tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-x86_64
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-aarch64
- target: x86_64-apple-darwin
os: macos-13-large
name: macos-x86_64
- target: aarch64-apple-darwin
os: macos-14-xlarge
name: macos-aarch64

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ matrix.target }}

- name: Install cross-compilation tools for ARM64 Linux
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV

- name: Build binary
run: cargo build --release --target ${{ matrix.target }}

- name: Create tarball
run: |
# Get version from tag
VERSION=${GITHUB_REF_NAME#v}

# Create directory structure
mkdir -p httpjail-${VERSION}-${{ matrix.name }}

# Copy binary
cp target/${{ matrix.target }}/release/httpjail httpjail-${VERSION}-${{ matrix.name }}/

# Copy README and LICENSE if they exist
[ -f README.md ] && cp README.md httpjail-${VERSION}-${{ matrix.name }}/
[ -f LICENSE ] && cp LICENSE httpjail-${VERSION}-${{ matrix.name }}/

# Create tarball
tar czf httpjail-${VERSION}-${{ matrix.name }}.tar.gz httpjail-${VERSION}-${{ matrix.name }}

# Output path for upload
echo "ASSET_PATH=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
echo "ASSET_NAME=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: binary-${{ matrix.name }}
path: ${{ env.ASSET_PATH }}
retention-days: 1

# Create release and publish to crates.io
release:
name: Create Release and Publish
needs: build-binaries
runs-on: ubuntu-latest-16-cores
environment: publish
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Need full history for changelog

- name: Check if test release
id: check_test
run: |
if [[ "${{ github.ref_name }}" == *-test ]]; then
echo "is_test=true" >> $GITHUB_OUTPUT
echo "This is a test release"
else
echo "is_test=false" >> $GITHUB_OUTPUT
echo "This is a production release"
fi

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}

- name: Verify version matches tag
if: steps.check_test.outputs.is_test == 'false'
run: |
# Extract version from Cargo.toml
CARGO_VERSION=$(grep -E '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')

# Get the git tag without the 'v' prefix
TAG_VERSION=${GITHUB_REF_NAME#v}

echo "Cargo.toml version: $CARGO_VERSION"
echo "Git tag version: $TAG_VERSION"

if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
echo "Error: Version mismatch!"
echo "Cargo.toml has version $CARGO_VERSION but git tag is $GITHUB_REF_NAME"
exit 1
fi

echo "Version check passed!"

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Generate changelog
id: changelog
run: |
# Get the current tag
CURRENT_TAG="${GITHUB_REF_NAME}"

# Get the previous tag
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^ 2>/dev/null || echo "")

# Generate changelog
if [ -z "$PREVIOUS_TAG" ]; then
echo "First release!"
CHANGELOG="Initial release of httpjail"
else
echo "Generating changelog from $PREVIOUS_TAG to $CURRENT_TAG"

# Get commit messages between tags
CHANGELOG=$(git log --pretty=format:"- %s (%h)" ${PREVIOUS_TAG}..${CURRENT_TAG})
fi

# Save to file for release body
if [[ "${{ github.ref_name }}" == *-test ]]; then
TEST_WARNING="## ⚠️ TEST RELEASE\n\nThis is a test release for validation purposes. Please use official releases for production.\n\n"
else
TEST_WARNING=""
fi

cat > RELEASE_NOTES.md << EOF
${TEST_WARNING}## What's Changed

$CHANGELOG

## Installation

Download the appropriate tarball for your platform, extract it, and place the binary in your PATH:

\`\`\`bash
tar xzf httpjail-*.tar.gz
sudo mv httpjail-*/httpjail /usr/local/bin/
# on macOS, you may need to run:
# xattr -d com.apple.quarantine httpjail-*/httpjail
# before the system allows you execute it.
\`\`\`

Or install from crates.io:

\`\`\`bash
cargo install httpjail
\`\`\`
EOF

echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
files: artifacts/**/*.tar.gz
draft: ${{ steps.check_test.outputs.is_test == 'true' }}
prerelease: ${{ steps.check_test.outputs.is_test == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to crates.io
if: steps.check_test.outputs.is_test == 'false'
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
61 changes: 0 additions & 61 deletions .github/workflows/publish.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
name: Release

on:
push:
tags:
- "v*"

env:
CARGO_TERM_COLOR: always

jobs:
# Run all tests first using the reusable workflow
tests:
uses: ./.github/workflows/tests.yml

# Build binaries for different platforms
build-binaries:
name: Build ${{ matrix.target }}
needs: tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-x86_64
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-aarch64
- target: x86_64-apple-darwin
os: macos-13-large
name: macos-x86_64
- target: aarch64-apple-darwin
os: macos-14-xlarge
name: macos-aarch64

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ matrix.target }}

- name: Install cross-compilation tools for ARM64 Linux
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV

- name: Build binary
run: cargo build --release --target ${{ matrix.target }}

- name: Create tarball
run: |
# Get version from tag
VERSION=${GITHUB_REF_NAME#v}

# Create directory structure
mkdir -p httpjail-${VERSION}-${{ matrix.name }}

# Copy binary
cp target/${{ matrix.target }}/release/httpjail httpjail-${VERSION}-${{ matrix.name }}/

# Copy README and LICENSE if they exist
[ -f README.md ] && cp README.md httpjail-${VERSION}-${{ matrix.name }}/
[ -f LICENSE ] && cp LICENSE httpjail-${VERSION}-${{ matrix.name }}/

# Create tarball
tar czf httpjail-${VERSION}-${{ matrix.name }}.tar.gz httpjail-${VERSION}-${{ matrix.name }}

# Output path for upload
echo "ASSET_PATH=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
echo "ASSET_NAME=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: binary-${{ matrix.name }}
path: ${{ env.ASSET_PATH }}
retention-days: 1

# Create release and publish to crates.io
release:
name: Create Release and Publish
needs: build-binaries
runs-on: ubuntu-latest-16-cores
environment: publish
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Need full history for changelog

- name: Check if test release
id: check_test
run: |
if [[ "${{ github.ref_name }}" == *-test ]]; then
echo "is_test=true" >> $GITHUB_OUTPUT
echo "This is a test release"
else
echo "is_test=false" >> $GITHUB_OUTPUT
echo "This is a production release"
fi

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}

- name: Verify version matches tag
if: steps.check_test.outputs.is_test == 'false'
run: |
# Extract version from Cargo.toml
CARGO_VERSION=$(grep -E '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')

# Get the git tag without the 'v' prefix
TAG_VERSION=${GITHUB_REF_NAME#v}

echo "Cargo.toml version: $CARGO_VERSION"
echo "Git tag version: $TAG_VERSION"

if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
echo "Error: Version mismatch!"
echo "Cargo.toml has version $CARGO_VERSION but git tag is $GITHUB_REF_NAME"
exit 1
fi

echo "Version check passed!"

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Generate changelog
id: changelog
run: |
# Get the current tag
CURRENT_TAG="${GITHUB_REF_NAME}"

# Get the previous tag
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^ 2>/dev/null || echo "")

# Generate changelog
if [ -z "$PREVIOUS_TAG" ]; then
echo "First release!"
CHANGELOG="Initial release of httpjail"
else
echo "Generating changelog from $PREVIOUS_TAG to $CURRENT_TAG"

# Get commit messages between tags
CHANGELOG=$(git log --pretty=format:"- %s (%h)" ${PREVIOUS_TAG}..${CURRENT_TAG})
fi

# Save to file for release body
if [[ "${{ github.ref_name }}" == *-test ]]; then
TEST_WARNING="## ⚠️ TEST RELEASE\n\nThis is a test release for validation purposes. Please use official releases for production.\n\n"
else
TEST_WARNING=""
fi

cat > RELEASE_NOTES.md << EOF
${TEST_WARNING}## What's Changed

$CHANGELOG

## Installation

Download the appropriate tarball for your platform, extract it, and place the binary in your PATH:

\`\`\`bash
tar xzf httpjail-*.tar.gz
sudo mv httpjail-*/httpjail /usr/local/bin/
# on macOS, you may need to run:
# xattr -d com.apple.quarantine httpjail-*/httpjail
# before the system allows you execute it.
\`\`\`

Or install from crates.io:

\`\`\`bash
cargo install httpjail
\`\`\`
EOF

echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
files: artifacts/**/*.tar.gz
draft: ${{ steps.check_test.outputs.is_test == 'true' }}
prerelease: ${{ steps.check_test.outputs.is_test == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to crates.io
if: steps.check_test.outputs.is_test == 'false'
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
61 changes: 0 additions & 61 deletions .github/workflows/publish.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
name: Release

on:
push:
tags:
- "v*"

env:
CARGO_TERM_COLOR: always

jobs:
# Run all tests first using the reusable workflow
tests:
uses: ./.github/workflows/tests.yml

# Build binaries for different platforms
build-binaries:
name: Build ${{ matrix.target }}
needs: tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-x86_64
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-aarch64
- target: x86_64-apple-darwin
os: macos-13-large
name: macos-x86_64
- target: aarch64-apple-darwin
os: macos-14-xlarge
name: macos-aarch64

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ matrix.target }}

- name: Install cross-compilation tools for ARM64 Linux
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV

- name: Build binary
run: cargo build --release --target ${{ matrix.target }}

- name: Create tarball
run: |
# Get version from tag
VERSION=${GITHUB_REF_NAME#v}

# Create directory structure
mkdir -p httpjail-${VERSION}-${{ matrix.name }}

# Copy binary
cp target/${{ matrix.target }}/release/httpjail httpjail-${VERSION}-${{ matrix.name }}/

# Copy README and LICENSE if they exist
[ -f README.md ] && cp README.md httpjail-${VERSION}-${{ matrix.name }}/
[ -f LICENSE ] && cp LICENSE httpjail-${VERSION}-${{ matrix.name }}/

# Create tarball
tar czf httpjail-${VERSION}-${{ matrix.name }}.tar.gz httpjail-${VERSION}-${{ matrix.name }}

# Output path for upload
echo "ASSET_PATH=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
echo "ASSET_NAME=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: binary-${{ matrix.name }}
path: ${{ env.ASSET_PATH }}
retention-days: 1

# Create release and publish to crates.io
release:
name: Create Release and Publish
needs: build-binaries
runs-on: ubuntu-latest-16-cores
environment: publish
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Need full history for changelog

- name: Check if test release
id: check_test
run: |
if [[ "${{ github.ref_name }}" == *-test ]]; then
echo "is_test=true" >> $GITHUB_OUTPUT
echo "This is a test release"
else
echo "is_test=false" >> $GITHUB_OUTPUT
echo "This is a production release"
fi

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}

- name: Verify version matches tag
if: steps.check_test.outputs.is_test == 'false'
run: |
# Extract version from Cargo.toml
CARGO_VERSION=$(grep -E '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')

# Get the git tag without the 'v' prefix
TAG_VERSION=${GITHUB_REF_NAME#v}

echo "Cargo.toml version: $CARGO_VERSION"
echo "Git tag version: $TAG_VERSION"

if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
echo "Error: Version mismatch!"
echo "Cargo.toml has version $CARGO_VERSION but git tag is $GITHUB_REF_NAME"
exit 1
fi

echo "Version check passed!"

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Generate changelog
id: changelog
run: |
# Get the current tag
CURRENT_TAG="${GITHUB_REF_NAME}"

# Get the previous tag
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^ 2>/dev/null || echo "")

# Generate changelog
if [ -z "$PREVIOUS_TAG" ]; then
echo "First release!"
CHANGELOG="Initial release of httpjail"
else
echo "Generating changelog from $PREVIOUS_TAG to $CURRENT_TAG"

# Get commit messages between tags
CHANGELOG=$(git log --pretty=format:"- %s (%h)" ${PREVIOUS_TAG}..${CURRENT_TAG})
fi

# Save to file for release body
if [[ "${{ github.ref_name }}" == *-test ]]; then
TEST_WARNING="## ⚠️ TEST RELEASE\n\nThis is a test release for validation purposes. Please use official releases for production.\n\n"
else
TEST_WARNING=""
fi

cat > RELEASE_NOTES.md << EOF
${TEST_WARNING}## What's Changed

$CHANGELOG

## Installation

Download the appropriate tarball for your platform, extract it, and place the binary in your PATH:

\`\`\`bash
tar xzf httpjail-*.tar.gz
sudo mv httpjail-*/httpjail /usr/local/bin/
# on macOS, you may need to run:
# xattr -d com.apple.quarantine httpjail-*/httpjail
# before the system allows you execute it.
\`\`\`

Or install from crates.io:

\`\`\`bash
cargo install httpjail
\`\`\`
EOF

echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
files: artifacts/**/*.tar.gz
draft: ${{ steps.check_test.outputs.is_test == 'true' }}
prerelease: ${{ steps.check_test.outputs.is_test == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to crates.io
if: steps.check_test.outputs.is_test == 'false'
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
61 changes: 0 additions & 61 deletions .github/workflows/publish.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
name: Release

on:
push:
tags:
- "v*"

env:
CARGO_TERM_COLOR: always

jobs:
# Run all tests first using the reusable workflow
tests:
uses: ./.github/workflows/tests.yml

# Build binaries for different platforms
build-binaries:
name: Build ${{ matrix.target }}
needs: tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-x86_64
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-aarch64
- target: x86_64-apple-darwin
os: macos-13-large
name: macos-x86_64
- target: aarch64-apple-darwin
os: macos-14-xlarge
name: macos-aarch64

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ matrix.target }}

- name: Install cross-compilation tools for ARM64 Linux
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV

- name: Build binary
run: cargo build --release --target ${{ matrix.target }}

- name: Create tarball
run: |
# Get version from tag
VERSION=${GITHUB_REF_NAME#v}

# Create directory structure
mkdir -p httpjail-${VERSION}-${{ matrix.name }}

# Copy binary
cp target/${{ matrix.target }}/release/httpjail httpjail-${VERSION}-${{ matrix.name }}/

# Copy README and LICENSE if they exist
[ -f README.md ] && cp README.md httpjail-${VERSION}-${{ matrix.name }}/
[ -f LICENSE ] && cp LICENSE httpjail-${VERSION}-${{ matrix.name }}/

# Create tarball
tar czf httpjail-${VERSION}-${{ matrix.name }}.tar.gz httpjail-${VERSION}-${{ matrix.name }}

# Output path for upload
echo "ASSET_PATH=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
echo "ASSET_NAME=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: binary-${{ matrix.name }}
path: ${{ env.ASSET_PATH }}
retention-days: 1

# Create release and publish to crates.io
release:
name: Create Release and Publish
needs: build-binaries
runs-on: ubuntu-latest-16-cores
environment: publish
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Need full history for changelog

- name: Check if test release
id: check_test
run: |
if [[ "${{ github.ref_name }}" == *-test ]]; then
echo "is_test=true" >> $GITHUB_OUTPUT
echo "This is a test release"
else
echo "is_test=false" >> $GITHUB_OUTPUT
echo "This is a production release"
fi

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}

- name: Verify version matches tag
if: steps.check_test.outputs.is_test == 'false'
run: |
# Extract version from Cargo.toml
CARGO_VERSION=$(grep -E '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')

# Get the git tag without the 'v' prefix
TAG_VERSION=${GITHUB_REF_NAME#v}

echo "Cargo.toml version: $CARGO_VERSION"
echo "Git tag version: $TAG_VERSION"

if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
echo "Error: Version mismatch!"
echo "Cargo.toml has version $CARGO_VERSION but git tag is $GITHUB_REF_NAME"
exit 1
fi

echo "Version check passed!"

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Generate changelog
id: changelog
run: |
# Get the current tag
CURRENT_TAG="${GITHUB_REF_NAME}"

# Get the previous tag
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^ 2>/dev/null || echo "")

# Generate changelog
if [ -z "$PREVIOUS_TAG" ]; then
echo "First release!"
CHANGELOG="Initial release of httpjail"
else
echo "Generating changelog from $PREVIOUS_TAG to $CURRENT_TAG"

# Get commit messages between tags
CHANGELOG=$(git log --pretty=format:"- %s (%h)" ${PREVIOUS_TAG}..${CURRENT_TAG})
fi

# Save to file for release body
if [[ "${{ github.ref_name }}" == *-test ]]; then
TEST_WARNING="## ⚠️ TEST RELEASE\n\nThis is a test release for validation purposes. Please use official releases for production.\n\n"
else
TEST_WARNING=""
fi

cat > RELEASE_NOTES.md << EOF
${TEST_WARNING}## What's Changed

$CHANGELOG

## Installation

Download the appropriate tarball for your platform, extract it, and place the binary in your PATH:

\`\`\`bash
tar xzf httpjail-*.tar.gz
sudo mv httpjail-*/httpjail /usr/local/bin/
# on macOS, you may need to run:
# xattr -d com.apple.quarantine httpjail-*/httpjail
# before the system allows you execute it.
\`\`\`

Or install from crates.io:

\`\`\`bash
cargo install httpjail
\`\`\`
EOF

echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
files: artifacts/**/*.tar.gz
draft: ${{ steps.check_test.outputs.is_test == 'true' }}
prerelease: ${{ steps.check_test.outputs.is_test == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to crates.io
if: steps.check_test.outputs.is_test == 'false'
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
61 changes: 0 additions & 61 deletions .github/workflows/publish.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
name: Release

on:
push:
tags:
- "v*"

env:
CARGO_TERM_COLOR: always

jobs:
# Run all tests first using the reusable workflow
tests:
uses: ./.github/workflows/tests.yml

# Build binaries for different platforms
build-binaries:
name: Build ${{ matrix.target }}
needs: tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-x86_64
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-aarch64
- target: x86_64-apple-darwin
os: macos-13-large
name: macos-x86_64
- target: aarch64-apple-darwin
os: macos-14-xlarge
name: macos-aarch64

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ matrix.target }}

- name: Install cross-compilation tools for ARM64 Linux
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV

- name: Build binary
run: cargo build --release --target ${{ matrix.target }}

- name: Create tarball
run: |
# Get version from tag
VERSION=${GITHUB_REF_NAME#v}

# Create directory structure
mkdir -p httpjail-${VERSION}-${{ matrix.name }}

# Copy binary
cp target/${{ matrix.target }}/release/httpjail httpjail-${VERSION}-${{ matrix.name }}/

# Copy README and LICENSE if they exist
[ -f README.md ] && cp README.md httpjail-${VERSION}-${{ matrix.name }}/
[ -f LICENSE ] && cp LICENSE httpjail-${VERSION}-${{ matrix.name }}/

# Create tarball
tar czf httpjail-${VERSION}-${{ matrix.name }}.tar.gz httpjail-${VERSION}-${{ matrix.name }}

# Output path for upload
echo "ASSET_PATH=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
echo "ASSET_NAME=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: binary-${{ matrix.name }}
path: ${{ env.ASSET_PATH }}
retention-days: 1

# Create release and publish to crates.io
release:
name: Create Release and Publish
needs: build-binaries
runs-on: ubuntu-latest-16-cores
environment: publish
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Need full history for changelog

- name: Check if test release
id: check_test
run: |
if [[ "${{ github.ref_name }}" == *-test ]]; then
echo "is_test=true" >> $GITHUB_OUTPUT
echo "This is a test release"
else
echo "is_test=false" >> $GITHUB_OUTPUT
echo "This is a production release"
fi

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}

- name: Verify version matches tag
if: steps.check_test.outputs.is_test == 'false'
run: |
# Extract version from Cargo.toml
CARGO_VERSION=$(grep -E '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')

# Get the git tag without the 'v' prefix
TAG_VERSION=${GITHUB_REF_NAME#v}

echo "Cargo.toml version: $CARGO_VERSION"
echo "Git tag version: $TAG_VERSION"

if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
echo "Error: Version mismatch!"
echo "Cargo.toml has version $CARGO_VERSION but git tag is $GITHUB_REF_NAME"
exit 1
fi

echo "Version check passed!"

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Generate changelog
id: changelog
run: |
# Get the current tag
CURRENT_TAG="${GITHUB_REF_NAME}"

# Get the previous tag
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^ 2>/dev/null || echo "")

# Generate changelog
if [ -z "$PREVIOUS_TAG" ]; then
echo "First release!"
CHANGELOG="Initial release of httpjail"
else
echo "Generating changelog from $PREVIOUS_TAG to $CURRENT_TAG"

# Get commit messages between tags
CHANGELOG=$(git log --pretty=format:"- %s (%h)" ${PREVIOUS_TAG}..${CURRENT_TAG})
fi

# Save to file for release body
if [[ "${{ github.ref_name }}" == *-test ]]; then
TEST_WARNING="## ⚠️ TEST RELEASE\n\nThis is a test release for validation purposes. Please use official releases for production.\n\n"
else
TEST_WARNING=""
fi

cat > RELEASE_NOTES.md << EOF
${TEST_WARNING}## What's Changed

$CHANGELOG

## Installation

Download the appropriate tarball for your platform, extract it, and place the binary in your PATH:

\`\`\`bash
tar xzf httpjail-*.tar.gz
sudo mv httpjail-*/httpjail /usr/local/bin/
# on macOS, you may need to run:
# xattr -d com.apple.quarantine httpjail-*/httpjail
# before the system allows you execute it.
\`\`\`

Or install from crates.io:

\`\`\`bash
cargo install httpjail
\`\`\`
EOF

echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
files: artifacts/**/*.tar.gz
draft: ${{ steps.check_test.outputs.is_test == 'true' }}
prerelease: ${{ steps.check_test.outputs.is_test == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to crates.io
if: steps.check_test.outputs.is_test == 'false'
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
61 changes: 0 additions & 61 deletions .github/workflows/publish.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
name: Release

on:
push:
tags:
- "v*"

env:
CARGO_TERM_COLOR: always

jobs:
# Run all tests first using the reusable workflow
tests:
uses: ./.github/workflows/tests.yml

# Build binaries for different platforms
build-binaries:
name: Build ${{ matrix.target }}
needs: tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-x86_64
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-aarch64
- target: x86_64-apple-darwin
os: macos-13-large
name: macos-x86_64
- target: aarch64-apple-darwin
os: macos-14-xlarge
name: macos-aarch64

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ matrix.target }}

- name: Install cross-compilation tools for ARM64 Linux
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV

- name: Build binary
run: cargo build --release --target ${{ matrix.target }}

- name: Create tarball
run: |
# Get version from tag
VERSION=${GITHUB_REF_NAME#v}

# Create directory structure
mkdir -p httpjail-${VERSION}-${{ matrix.name }}

# Copy binary
cp target/${{ matrix.target }}/release/httpjail httpjail-${VERSION}-${{ matrix.name }}/

# Copy README and LICENSE if they exist
[ -f README.md ] && cp README.md httpjail-${VERSION}-${{ matrix.name }}/
[ -f LICENSE ] && cp LICENSE httpjail-${VERSION}-${{ matrix.name }}/

# Create tarball
tar czf httpjail-${VERSION}-${{ matrix.name }}.tar.gz httpjail-${VERSION}-${{ matrix.name }}

# Output path for upload
echo "ASSET_PATH=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
echo "ASSET_NAME=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: binary-${{ matrix.name }}
path: ${{ env.ASSET_PATH }}
retention-days: 1

# Create release and publish to crates.io
release:
name: Create Release and Publish
needs: build-binaries
runs-on: ubuntu-latest-16-cores
environment: publish
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Need full history for changelog

- name: Check if test release
id: check_test
run: |
if [[ "${{ github.ref_name }}" == *-test ]]; then
echo "is_test=true" >> $GITHUB_OUTPUT
echo "This is a test release"
else
echo "is_test=false" >> $GITHUB_OUTPUT
echo "This is a production release"
fi

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}

- name: Verify version matches tag
if: steps.check_test.outputs.is_test == 'false'
run: |
# Extract version from Cargo.toml
CARGO_VERSION=$(grep -E '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')

# Get the git tag without the 'v' prefix
TAG_VERSION=${GITHUB_REF_NAME#v}

echo "Cargo.toml version: $CARGO_VERSION"
echo "Git tag version: $TAG_VERSION"

if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
echo "Error: Version mismatch!"
echo "Cargo.toml has version $CARGO_VERSION but git tag is $GITHUB_REF_NAME"
exit 1
fi

echo "Version check passed!"

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Generate changelog
id: changelog
run: |
# Get the current tag
CURRENT_TAG="${GITHUB_REF_NAME}"

# Get the previous tag
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^ 2>/dev/null || echo "")

# Generate changelog
if [ -z "$PREVIOUS_TAG" ]; then
echo "First release!"
CHANGELOG="Initial release of httpjail"
else
echo "Generating changelog from $PREVIOUS_TAG to $CURRENT_TAG"

# Get commit messages between tags
CHANGELOG=$(git log --pretty=format:"- %s (%h)" ${PREVIOUS_TAG}..${CURRENT_TAG})
fi

# Save to file for release body
if [[ "${{ github.ref_name }}" == *-test ]]; then
TEST_WARNING="## ⚠️ TEST RELEASE\n\nThis is a test release for validation purposes. Please use official releases for production.\n\n"
else
TEST_WARNING=""
fi

cat > RELEASE_NOTES.md << EOF
${TEST_WARNING}## What's Changed

$CHANGELOG

## Installation

Download the appropriate tarball for your platform, extract it, and place the binary in your PATH:

\`\`\`bash
tar xzf httpjail-*.tar.gz
sudo mv httpjail-*/httpjail /usr/local/bin/
# on macOS, you may need to run:
# xattr -d com.apple.quarantine httpjail-*/httpjail
# before the system allows you execute it.
\`\`\`

Or install from crates.io:

\`\`\`bash
cargo install httpjail
\`\`\`
EOF

echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
files: artifacts/**/*.tar.gz
draft: ${{ steps.check_test.outputs.is_test == 'true' }}
prerelease: ${{ steps.check_test.outputs.is_test == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to crates.io
if: steps.check_test.outputs.is_test == 'false'
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
61 changes: 0 additions & 61 deletions .github/workflows/publish.yml

This file was deleted.

219 changes: 219 additions & 0 deletions .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
name: Release

on:
push:
tags:
- "v*"

env:
CARGO_TERM_COLOR: always

jobs:
# Run all tests first using the reusable workflow
tests:
uses: ./.github/workflows/tests.yml

# Build binaries for different platforms
build-binaries:
name: Build ${{ matrix.target }}
needs: tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-x86_64
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest-16-cores
name: linux-aarch64
- target: x86_64-apple-darwin
os: macos-13-large
name: macos-x86_64
- target: aarch64-apple-darwin
os: macos-14-xlarge
name: macos-aarch64

steps:
- uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ matrix.target }}

- name: Install cross-compilation tools for ARM64 Linux
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV

- name: Build binary
run: cargo build --release --target ${{ matrix.target }}

- name: Create tarball
run: |
# Get version from tag
VERSION=${GITHUB_REF_NAME#v}

# Create directory structure
mkdir -p httpjail-${VERSION}-${{ matrix.name }}

# Copy binary
cp target/${{ matrix.target }}/release/httpjail httpjail-${VERSION}-${{ matrix.name }}/

# Copy README and LICENSE if they exist
[ -f README.md ] && cp README.md httpjail-${VERSION}-${{ matrix.name }}/
[ -f LICENSE ] && cp LICENSE httpjail-${VERSION}-${{ matrix.name }}/

# Create tarball
tar czf httpjail-${VERSION}-${{ matrix.name }}.tar.gz httpjail-${VERSION}-${{ matrix.name }}

# Output path for upload
echo "ASSET_PATH=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
echo "ASSET_NAME=httpjail-${VERSION}-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: binary-${{ matrix.name }}
path: ${{ env.ASSET_PATH }}
retention-days: 1

# Create release and publish to crates.io
release:
name: Create Release and Publish
needs: build-binaries
runs-on: ubuntu-latest-16-cores
environment: publish
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Need full history for changelog

- name: Check if test release
id: check_test
run: |
if [[ "${{ github.ref_name }}" == *-test ]]; then
echo "is_test=true" >> $GITHUB_OUTPUT
echo "This is a test release"
else
echo "is_test=false" >> $GITHUB_OUTPUT
echo "This is a production release"
fi

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
shared-key: ${{ runner.os }}

- name: Verify version matches tag
if: steps.check_test.outputs.is_test == 'false'
run: |
# Extract version from Cargo.toml
CARGO_VERSION=$(grep -E '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')

# Get the git tag without the 'v' prefix
TAG_VERSION=${GITHUB_REF_NAME#v}

echo "Cargo.toml version: $CARGO_VERSION"
echo "Git tag version: $TAG_VERSION"

if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
echo "Error: Version mismatch!"
echo "Cargo.toml has version $CARGO_VERSION but git tag is $GITHUB_REF_NAME"
exit 1
fi

echo "Version check passed!"

- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: artifacts

- name: Generate changelog
id: changelog
run: |
# Get the current tag
CURRENT_TAG="${GITHUB_REF_NAME}"

# Get the previous tag
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^ 2>/dev/null || echo "")

# Generate changelog
if [ -z "$PREVIOUS_TAG" ]; then
echo "First release!"
CHANGELOG="Initial release of httpjail"
else
echo "Generating changelog from $PREVIOUS_TAG to $CURRENT_TAG"

# Get commit messages between tags
CHANGELOG=$(git log --pretty=format:"- %s (%h)" ${PREVIOUS_TAG}..${CURRENT_TAG})
fi

# Save to file for release body
if [[ "${{ github.ref_name }}" == *-test ]]; then
TEST_WARNING="## ⚠️ TEST RELEASE\n\nThis is a test release for validation purposes. Please use official releases for production.\n\n"
else
TEST_WARNING=""
fi

cat > RELEASE_NOTES.md << EOF
${TEST_WARNING}## What's Changed

$CHANGELOG

## Installation

Download the appropriate tarball for your platform, extract it, and place the binary in your PATH:

\`\`\`bash
tar xzf httpjail-*.tar.gz
sudo mv httpjail-*/httpjail /usr/local/bin/
# on macOS, you may need to run:
# xattr -d com.apple.quarantine httpjail-*/httpjail
# before the system allows you execute it.
\`\`\`

Or install from crates.io:

\`\`\`bash
cargo install httpjail
\`\`\`
EOF

echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_ENV

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
body_path: RELEASE_NOTES.md
files: artifacts/**/*.tar.gz
draft: ${{ steps.check_test.outputs.is_test == 'true' }}
prerelease: ${{ steps.check_test.outputs.is_test == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to crates.io
if: steps.check_test.outputs.is_test == 'false'
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading