Skip to content

Commit 3e5cf42

Browse files
authored
Merge pull request #100 from acheronfail/next
next
2 parents 2e27080 + fae1d31 commit 3e5cf42

File tree

13 files changed

+317
-321
lines changed

13 files changed

+317
-321
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
RUST_BACKTRACE: 1
7575
runs-on: ${{ matrix.os }}
7676
strategy:
77+
fail-fast: false
7778
matrix:
7879
build:
7980
# We test repgrep on a pinned version of Rust, along with the moving
@@ -94,8 +95,8 @@ jobs:
9495
include:
9596
- build: pinned
9697
os: ubuntu-latest
97-
# NOTE: ripgrep requires 1.72.0
98-
rust: 1.72.0
98+
# NOTE: home requires 1.81.0
99+
rust: 1.81.0
99100
- build: stable
100101
os: ubuntu-latest
101102
rust: stable
@@ -104,21 +105,20 @@ jobs:
104105
rust: beta
105106

106107
# nightly builds
107-
# NOTE: we pin to a specific version since sometimes things fail to compile on the latest nightly builds
108108
- build: nightly
109109
os: ubuntu-latest
110-
rust: nightly-2023-12-04
110+
rust: nightly
111111
- build: nightly-musl
112112
os: ubuntu-latest
113-
rust: nightly-2023-12-04
113+
rust: nightly
114114
target: x86_64-unknown-linux-musl
115115
- build: nightly-32
116116
os: ubuntu-latest
117-
rust: nightly-2023-12-04
117+
rust: nightly
118118
target: i686-unknown-linux-gnu
119119
- build: nightly-arm
120120
os: ubuntu-latest
121-
rust: nightly-2023-12-04
121+
rust: nightly
122122
# For stripping release binaries:
123123
# docker run --rm -v $PWD/target:/target:Z \
124124
# rustembedded/cross:arm-unknown-linux-gnueabihf \
@@ -127,13 +127,13 @@ jobs:
127127
target: arm-unknown-linux-gnueabihf
128128
- build: macos
129129
os: macos-latest
130-
rust: nightly-2023-12-04
130+
rust: nightly
131131
- build: win-msvc
132-
os: windows-2019
133-
rust: nightly-2023-12-04
132+
os: windows-2022
133+
rust: nightly
134134
- build: win-gnu
135-
os: windows-2019
136-
rust: nightly-2023-12-04-x86_64-gnu
135+
os: windows-2022
136+
rust: nightly-x86_64-gnu
137137
steps:
138138
- name: Checkout repository
139139
uses: actions/checkout@v3

.github/workflows/release.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: echo "${{ env.CRATE_VERSION }}" > artifacts/release-version
4747

4848
- name: Upload artifacts
49-
uses: actions/upload-artifact@v1
49+
uses: actions/upload-artifact@v4
5050
with:
5151
name: artifacts
5252
path: artifacts
@@ -73,31 +73,31 @@ jobs:
7373
# NOTE: we pin to a specific version since sometimes things fail to compile on the latest nightly builds
7474
- build: linux-gnu
7575
os: ubuntu-latest
76-
rust: nightly-2023-12-04
76+
rust: nightly
7777
target: x86_64-unknown-linux-gnu
7878
- build: linux-musl
7979
os: ubuntu-latest
80-
rust: nightly-2023-12-04
80+
rust: nightly
8181
target: x86_64-unknown-linux-musl
8282
- build: linux-arm-gnueabihf
8383
os: ubuntu-latest
84-
rust: nightly-2023-12-04
84+
rust: nightly
8585
target: arm-unknown-linux-gnueabihf
8686
- build: macos
8787
os: macos-latest
88-
rust: nightly-2023-12-04
88+
rust: nightly
8989
target: x86_64-apple-darwin
9090
- build: win-msvc
91-
os: windows-2019
92-
rust: nightly-2023-12-04
91+
os: windows-2022
92+
rust: nightly
9393
target: x86_64-pc-windows-msvc
9494
- build: win-gnu
95-
os: windows-2019
96-
rust: nightly-2023-12-04-x86_64-gnu
95+
os: windows-2022
96+
rust: nightly-x86_64-gnu
9797
target: x86_64-pc-windows-gnu
9898
- build: win32-msvc
99-
os: windows-2019
100-
rust: nightly-2023-12-04
99+
os: windows-2022
100+
rust: nightly
101101
target: i686-pc-windows-msvc
102102

103103
steps:
@@ -158,7 +158,7 @@ jobs:
158158
echo "target dir is: ${{ env.TARGET_DIR }}"
159159
160160
- name: Get release download URL
161-
uses: actions/download-artifact@v1
161+
uses: actions/download-artifact@v4
162162
with:
163163
name: artifacts
164164
path: artifacts

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
.vscode
33

44
/target
5-
/benches/rg.json
5+
/benches/rg.json
6+
7+
*.log

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# 0.16.0
2+
3+
- fae1075 update help prompt with updated keybindings
4+
- fae1d70 ignore *.log files
5+
- fae1fb24 Now when entering a replacement, pressing enter advances the app
6+
- fae1ffb C-c now cancels application
7+
- fae1d4d C-u should delete input when typing
8+
- 7378ee6 Merge pull request #102 from acheronfail/dep/tempfile
9+
- fae1196 cargo update
10+
- fae155e update due to Stebalien/tempfile#157 being closed
11+
- fae1ef5 remove obsolete comment
12+
113
# 0.15.0
214

315
- fae13fc don't treat patterns as regexes if --fixed-strings is passed

0 commit comments

Comments
 (0)