Skip to content

Commit

Permalink
Merge pull request #100 from acheronfail/next
Browse files Browse the repository at this point in the history
next
  • Loading branch information
acheronfail authored Feb 12, 2025
2 parents 2e27080 + fae1d31 commit 3e5cf42
Show file tree
Hide file tree
Showing 13 changed files with 317 additions and 321 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ jobs:
RUST_BACKTRACE: 1
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
build:
# We test repgrep on a pinned version of Rust, along with the moving
Expand All @@ -94,8 +95,8 @@ jobs:
include:
- build: pinned
os: ubuntu-latest
# NOTE: ripgrep requires 1.72.0
rust: 1.72.0
# NOTE: home requires 1.81.0
rust: 1.81.0
- build: stable
os: ubuntu-latest
rust: stable
Expand All @@ -104,21 +105,20 @@ jobs:
rust: beta

# nightly builds
# NOTE: we pin to a specific version since sometimes things fail to compile on the latest nightly builds
- build: nightly
os: ubuntu-latest
rust: nightly-2023-12-04
rust: nightly
- build: nightly-musl
os: ubuntu-latest
rust: nightly-2023-12-04
rust: nightly
target: x86_64-unknown-linux-musl
- build: nightly-32
os: ubuntu-latest
rust: nightly-2023-12-04
rust: nightly
target: i686-unknown-linux-gnu
- build: nightly-arm
os: ubuntu-latest
rust: nightly-2023-12-04
rust: nightly
# For stripping release binaries:
# docker run --rm -v $PWD/target:/target:Z \
# rustembedded/cross:arm-unknown-linux-gnueabihf \
Expand All @@ -127,13 +127,13 @@ jobs:
target: arm-unknown-linux-gnueabihf
- build: macos
os: macos-latest
rust: nightly-2023-12-04
rust: nightly
- build: win-msvc
os: windows-2019
rust: nightly-2023-12-04
os: windows-2022
rust: nightly
- build: win-gnu
os: windows-2019
rust: nightly-2023-12-04-x86_64-gnu
os: windows-2022
rust: nightly-x86_64-gnu
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: echo "${{ env.CRATE_VERSION }}" > artifacts/release-version

- name: Upload artifacts
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: artifacts
path: artifacts
Expand All @@ -73,31 +73,31 @@ jobs:
# NOTE: we pin to a specific version since sometimes things fail to compile on the latest nightly builds
- build: linux-gnu
os: ubuntu-latest
rust: nightly-2023-12-04
rust: nightly
target: x86_64-unknown-linux-gnu
- build: linux-musl
os: ubuntu-latest
rust: nightly-2023-12-04
rust: nightly
target: x86_64-unknown-linux-musl
- build: linux-arm-gnueabihf
os: ubuntu-latest
rust: nightly-2023-12-04
rust: nightly
target: arm-unknown-linux-gnueabihf
- build: macos
os: macos-latest
rust: nightly-2023-12-04
rust: nightly
target: x86_64-apple-darwin
- build: win-msvc
os: windows-2019
rust: nightly-2023-12-04
os: windows-2022
rust: nightly
target: x86_64-pc-windows-msvc
- build: win-gnu
os: windows-2019
rust: nightly-2023-12-04-x86_64-gnu
os: windows-2022
rust: nightly-x86_64-gnu
target: x86_64-pc-windows-gnu
- build: win32-msvc
os: windows-2019
rust: nightly-2023-12-04
os: windows-2022
rust: nightly
target: i686-pc-windows-msvc

steps:
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
echo "target dir is: ${{ env.TARGET_DIR }}"
- name: Get release download URL
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: artifacts
path: artifacts
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
.vscode

/target
/benches/rg.json
/benches/rg.json

*.log
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# 0.16.0

- fae1075 update help prompt with updated keybindings
- fae1d70 ignore *.log files
- fae1fb24 Now when entering a replacement, pressing enter advances the app
- fae1ffb C-c now cancels application
- fae1d4d C-u should delete input when typing
- 7378ee6 Merge pull request #102 from acheronfail/dep/tempfile
- fae1196 cargo update
- fae155e update due to Stebalien/tempfile#157 being closed
- fae1ef5 remove obsolete comment

# 0.15.0

- fae13fc don't treat patterns as regexes if --fixed-strings is passed
Expand Down
Loading

0 comments on commit 3e5cf42

Please sign in to comment.