Skip to content

Commit 66e06bf

Browse files
authored
Revert "Refactoring (build.sh -> build.lua)"
1 parent 3eb207f commit 66e06bf

File tree

6 files changed

+22
-33
lines changed

6 files changed

+22
-33
lines changed

.github/workflows/ci.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
matrix:
1212
include:
1313
- os: ubuntu-20.04
14-
url: https://github.com/neovim/neovim/releases/download/v0.9.2/nvim-linux64.tar.gz
14+
url: https://github.com/neovim/neovim/releases/download/v0.7.0/nvim-linux64.tar.gz
1515
manager: sudo apt-get
1616
packages: -y fd-find ripgrep
1717
steps:
@@ -43,9 +43,7 @@ jobs:
4343

4444
- name: build rust
4545
run: |
46-
export PATH="${PWD}/_neovim/bin:${PATH}"
47-
export VIM="${PWD}/_neovim/share/nvim/runtime"
48-
./build.lua
46+
./build.sh
4947
5048
- name: Run tests
5149
run: |

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ test:
22
nvim --headless --noplugin -u tests/minimal.vim -c "PlenaryBustedDirectory tests/ {minimal_init = 'tests/minimal.vim'}"
33

44
build-oxi:
5-
./build.lua
5+
./build.sh

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ There are two replace methods `sed` and `oxi`.
303303
Install `oxi`:
304304

305305
- you will need to install `cargo` and run the command:
306-
[build.lua](./build.lua)
306+
[build.sh](./build.sh)
307307
[nvim-oxi](https://github.com/noib3/nvim-oxi)
308308

309309
- set default replace command to `"oxi"` on `setup()`

build.lua

-26
This file was deleted.

build.sh

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
3+
cd spectre_oxi
4+
5+
cargo build --release
6+
7+
if [ "$(uname)" == "Darwin" ]; then
8+
cp target/release/libspectre_oxi.dylib ../lua/spectre_oxi.so
9+
elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
10+
cp target/release/libspectre_oxi.so ../lua/spectre_oxi.so
11+
elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
12+
cp target/release/libspectre_oxi.dll ../lua/spectre_oxi.dll
13+
fi
14+
rm -rf target
15+
echo "Build Done"
16+
17+

doc/spectre.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ There are two replace methods `sed` and `oxi`.
330330
Install `oxi`:
331331

332332

333-
- you will need to install `cargo` and run the command: build.lua <./build.lua>
333+
- you will need to install `cargo` and run the command: build.sh <./build.sh>
334334
nvim-oxi <https://github.com/noib3/nvim-oxi>
335335
- set default replace command to `"oxi"` on `setup()`
336336

0 commit comments

Comments
 (0)