Compare commits

..

22 commits
v0.2.1 ... main

Author SHA1 Message Date
Renovate Bot
a269a243cf chore(deps): update kemitix/rust action to v2.4.1
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline was successful
Rust / build (map[name:stable]) (pull_request) Successful in 1m31s
Rust / build (map[name:nightly]) (pull_request) Successful in 3m37s
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
Rust / build (map[name:nightly]) (push) Successful in 1m38s
Rust / build (map[name:stable]) (push) Failing after 1m38s
2024-11-14 10:49:44 +00:00
Renovate Bot
219c8b633f chore(deps): update docker.io/rust docker tag to v1.82.0
All checks were successful
Rust / build (map[name:nightly]) (pull_request) Successful in 1m48s
Rust / build (map[name:stable]) (pull_request) Successful in 1m17s
Rust / build (map[name:stable]) (push) Successful in 1m41s
Rust / build (map[name:nightly]) (push) Successful in 3m35s
ci/woodpecker/cron/woodpecker Pipeline was successful
2024-10-17 23:47:49 +00:00
Renovate Bot
003cdd6f59 chore(deps): update kemitix/rust action to v2.3.0
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Rust / build (map[name:nightly]) (pull_request) Successful in 1m20s
Rust / build (map[name:stable]) (pull_request) Successful in 2m48s
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
Rust / build (map[name:nightly]) (push) Successful in 1m44s
Rust / build (map[name:stable]) (push) Successful in 3m45s
ci/woodpecker/cron/woodpecker Pipeline was successful
2024-09-30 21:47:31 +00:00
Renovate Bot
242a2730eb chore(deps): update kemitix/rust action to v2.2.0
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Rust / build (map[name:nightly]) (pull_request) Successful in 2m11s
Rust / build (map[name:stable]) (pull_request) Successful in 1m24s
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
Rust / build (map[name:nightly]) (push) Successful in 1m37s
Rust / build (map[name:stable]) (push) Successful in 1m42s
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
2024-09-25 08:32:37 +00:00
Renovate Bot
590f692094 chore(deps): update kemitix/rust action to v2.1.0
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Rust / build (map[name:nightly]) (pull_request) Successful in 1m20s
Rust / build (map[name:stable]) (pull_request) Successful in 1m7s
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
Rust / build (map[name:nightly]) (push) Successful in 2m34s
Rust / build (map[name:stable]) (push) Successful in 1m10s
ci/woodpecker/cron/woodpecker Pipeline was successful
2024-09-17 14:32:56 +00:00
26db7106a1 build: run test against Rust nightly
All checks were successful
Rust / build (map[name:stable]) (push) Successful in 1m10s
Rust / build (map[name:nightly]) (push) Successful in 1m22s
ci/woodpecker/push/woodpecker Pipeline was successful
2024-09-17 14:44:40 +01:00
7f5af60757 build: run integration test with same os as it was built
All checks were successful
Rust / build (push) Successful in 1m13s
ci/woodpecker/push/woodpecker Pipeline was successful
2024-09-17 14:30:05 +01:00
Renovate Bot
fc7fbca090 chore(deps): update docker.io/rust docker tag to v1.81.0
All checks were successful
Rust / build (pull_request) Successful in 38s
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Rust / build (push) Successful in 28s
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
2024-09-05 23:47:07 +00:00
f645c4d15e build: update forgejo action to rust 1.80.1
All checks were successful
Rust / build (push) Successful in 21s
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
2024-08-11 09:04:47 +01:00
Renovate Bot
bf7486235f chore(deps): update docker.io/rust docker tag to v1.80.1
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
Rust / build (pull_request) Failing after 28s
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
Rust / build (push) Failing after 11s
2024-08-08 20:47:04 +00:00
Renovate Bot
b2f02297e9 chore(deps): update kemitix/rust action to v1
All checks were successful
ci/woodpecker/cron/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Rust / build (pull_request) Successful in 17s
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
Rust / build (push) Successful in 16s
ci/woodpecker/push/woodpecker Pipeline was successful
2024-08-02 18:46:33 +00:00
Renovate Bot
6954185ef1 chore(deps): update docker.io/tamasfe/taplo docker tag to v0.9.3
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline was successful
Rust / build (pull_request) Failing after 11s
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
Rust / build (push) Failing after 10s
ci/woodpecker/push/woodpecker Pipeline was successful
2024-07-31 12:16:17 +00:00
Renovate Bot
29df35b196 chore(deps): woodpecker update docker.io/rust docker tag to v1.80.0
All checks were successful
Rust / build (push) Successful in 14s
ci/woodpecker/push/woodpecker Pipeline was successful
2024-07-30 07:38:04 +01:00
21c8f0883a build: woodpecker: remove steps migrated to forge actions
All checks were successful
Rust / build (push) Successful in 15s
ci/woodpecker/push/woodpecker Pipeline was successful
2024-07-30 07:38:04 +01:00
bef0389ce6 build: add forgejo workflow push-next
All checks were successful
Rust / build (push) Successful in 20s
ci/woodpecker/push/woodpecker Pipeline was successful
2024-07-30 07:28:10 +01:00
Renovate Bot
c6072d8ed3 chore(deps): update docker.io/tamasfe/taplo docker tag to v0.9.2
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-07-12 11:45:48 +00:00
Renovate Bot
52bdc5c615 chore(deps): update docker.io/rust docker tag to v1.79.0
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
2024-06-13 18:01:01 +00:00
4d7dcb2665 chore(renovate): update update major and minor version
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
2024-05-14 14:02:38 +01:00
021b7ea8dd Update docker.io/rust Docker tag to v1.78 (#13)
All checks were successful
ci/woodpecker/cron/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| docker.io/rust | minor | `1.77` -> `1.78` |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMzQuNCIsInVwZGF0ZWRJblZlciI6IjM3LjMzNC40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Co-authored-by: Renovate Bot <renovate@kemitix.net>
Co-authored-by: kemitix <kemitix@noreply.kemitix.net>
Reviewed-on: #13
Co-authored-by: renovate <renovate@noreply.kemitix.net>
Co-committed-by: renovate <renovate@noreply.kemitix.net>
2024-05-03 19:24:11 +01:00
69b643309d Update docker.io/rust Docker tag to v1.77 (#11)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| docker.io/rust | minor | `1.76` -> `1.77` |

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNjQuMCIsInVwZGF0ZWRJblZlciI6IjM3LjI2NC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: Renovate Bot <renovate@kemitix.net>
Reviewed-on: #11
Co-authored-by: renovate <renovate@noreply.kemitix.net>
Co-committed-by: renovate <renovate@noreply.kemitix.net>
2024-03-21 20:54:15 +00:00
cb9ae3ca5e release/0.2.1 (#10)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/cron/woodpecker Pipeline was successful
Reviewed-on: #10
Co-authored-by: Paul Campbell <pcampbell@kemitix.net>
Co-committed-by: Paul Campbell <pcampbell@kemitix.net>
2024-02-28 17:48:25 +00:00
430819cd81 Version set to 0.2.1 (#9)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #9
Co-authored-by: Paul Campbell <pcampbell@kemitix.net>
Co-committed-by: Paul Campbell <pcampbell@kemitix.net>
2024-02-26 13:59:29 +00:00
5 changed files with 87 additions and 81 deletions

View file

@ -0,0 +1,52 @@
name: Rust
on:
push:
branches: ["next"]
pull_request:
branches: ["main"]
env:
CARGO_TERM_COLOR: always
jobs:
build:
runs-on: docker
strategy:
matrix:
toolchain:
- name: stable
- name: nightly
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Format
uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with:
args: ${{ matrix.toolchain.name }} cargo fmt --all -- --check
# - name: Machete
# uses: https://github.com/bnjbvr/cargo-machete@v0.6.2
- name: Clippy
uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with:
args: ${{ matrix.toolchain.name }} cargo clippy
- name: Build
uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with:
args: ${{ matrix.toolchain.name }} cargo build
- name: Test
uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with:
args: ${{ matrix.toolchain.name }} cargo test --no-fail-fast
- name: Integration
uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with:
args: ./test.sh

View file

@ -1,5 +1,5 @@
variables: variables:
- &rust_image "docker.io/rust:1.76" - &rust_image "docker.io/rust:1.82.0"
- &slow_check_paths - &slow_check_paths
- path: - path:
# rust source code # rust source code
@ -14,22 +14,11 @@ variables:
- ".woodpecker.yml" - ".woodpecker.yml"
steps: steps:
toml_fmt: toml_fmt:
image: docker.io/tamasfe/taplo:0.8.1 image: docker.io/tamasfe/taplo:0.9.3
commands: commands:
- taplo format --check - taplo format --check
cargo_fmt:
image: docker.io/rustlang/rust:nightly
environment:
# store cargo data in repo folder so that it gets cached between steps
CARGO_HOME: .cargo_home
commands:
- rustup component add rustfmt
- cargo fmt --check
cargo_machete: cargo_machete:
image: *rust_image image: *rust_image
commands: commands:
@ -47,46 +36,6 @@ steps:
- IGNORED=$(git ls-files --cached -i --exclude-standard) - IGNORED=$(git ls-files --cached -i --exclude-standard)
- if [[ "$IGNORED" ]]; then echo "Ignored files present:\n$IGNORED\n"; exit 1; fi - if [[ "$IGNORED" ]]; then echo "Ignored files present:\n$IGNORED\n"; exit 1; fi
check:
image: *rust_image
environment:
CARGO_HOME: .cargo_home
commands:
- cargo check
when: *slow_check_paths
cargo_clippy:
image: *rust_image
environment:
CARGO_HOME: .cargo_home
commands:
- rustup component add clippy
- cargo clippy --tests --all-targets -- -D warnings
when: *slow_check_paths
cargo_build:
image: *rust_image
environment:
CARGO_HOME: .cargo_home
commands:
- cargo build
- mv target/debug/skip target/skip
when: *slow_check_paths
cargo_test:
image: *rust_image
environment:
RUST_BACKTRACE: "1"
CARGO_HOME: .cargo_home
commands:
- cargo test --no-fail-fast
when: *slow_check_paths
integration_test:
image: *rust_image
commands:
- ./test.sh
publish_to_crates_io: publish_to_crates_io:
image: *rust_image image: *rust_image
commands: commands:

View file

@ -2,7 +2,7 @@
Skip part of a file. Skip part of a file.
As `head` will show the top of a file after a number of line, As `head` will show the top of a file up-to a number of line,
so `skip` will do the opposite, and not show the top of the file, so `skip` will do the opposite, and not show the top of the file,
but will show the rest. but will show the rest.

View file

@ -1,6 +1,10 @@
{ {
"$schema": "https://docs.renovatebot.com/renovate-schema.json", "$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [ "extends": ["config:recommended"],
"config:recommended" "packageRules": [
{
"matchManagers": ["cargo"],
"rangeStrategy": "replace"
}
] ]
} }

51
test.sh
View file

@ -5,37 +5,38 @@ set -e
echo "PWD: $PWD" echo "PWD: $PWD"
ls -l ls -l
ls -l target ls -l target
SKIP="./target/skip" SKIP="./target/debug/skip"
DIFF="diff -u --color" DIFF="diff -u --color"
if test ! -x $SKIP ; then if test ! -x $SKIP; then
echo "File missing: $SKIP - try 'cargo build'" echo "File missing: $SKIP - try 'cargo build'"
exit 1 exit 1
fi fi
echo "> skip a line when reading from stdin" echo "> skip a line when reading from stdin"
INPUT=$(cat<<EOF INPUT=$(
cat <<EOF
line 1 line 1
line 2 line 2
EOF EOF
) )
echo "line 2" > test.expect echo "line 2" >test.expect
echo "$INPUT" | $SKIP 1 > test.out echo "$INPUT" | $SKIP 1 >test.out
$DIFF test.expect test.out $DIFF test.expect test.out
rm test.expect test.out rm test.expect test.out
echo "> skip a line when reading from a file" echo "> skip a line when reading from a file"
cat<<EOF > test.in cat <<EOF >test.in
line 1 line 1
line 2 line 2
EOF EOF
echo "line 2" > test.expect echo "line 2" >test.expect
$SKIP 1 test.in > test.out $SKIP 1 test.in >test.out
$DIFF test.expect test.out $DIFF test.expect test.out
rm test.expect test.out rm test.expect test.out
echo "> skip until 2 matching lines seen" echo "> skip until 2 matching lines seen"
cat<<EOF > test.in cat <<EOF >test.in
alpha alpha
beta beta
alpha alpha
@ -43,17 +44,17 @@ alpha
gamma gamma
alpha alpha
EOF EOF
cat<<EOF > test.expect cat <<EOF >test.expect
alpha alpha
gamma gamma
alpha alpha
EOF EOF
$SKIP 2 test.in --line alpha > test.out $SKIP 2 test.in --line alpha >test.out
$DIFF test.expect test.out $DIFF test.expect test.out
rm test.in test.expect test.out rm test.in test.expect test.out
echo "> skip lines until 2 tokens seen" echo "> skip lines until 2 tokens seen"
cat<<EOF > test.in cat <<EOF >test.in
Lorem ipsum dolor sit amet, Lorem ipsum dolor sit amet,
consectetur adipiscing elit, consectetur adipiscing elit,
sed do eiusmod tempor incididunt sed do eiusmod tempor incididunt
@ -63,18 +64,18 @@ quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea laboris nisi ut aliquip ex ea
commodo consequat. commodo consequat.
EOF EOF
cat<<EOF > test.expect cat <<EOF >test.expect
Ut enim ad minim veniam, Ut enim ad minim veniam,
quis nostrud exercitation ullamco quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea laboris nisi ut aliquip ex ea
commodo consequat. commodo consequat.
EOF EOF
$SKIP 2 test.in --token dolor > test.out $SKIP 2 test.in --token dolor >test.out
$DIFF test.expect test.out $DIFF test.expect test.out
rm test.in test.expect test.out rm test.in test.expect test.out
echo "> handle unknown parameter with simple error message" echo "> handle unknown parameter with simple error message"
cat<<EOF > test.expect.err cat <<EOF >test.expect.err
error: unexpected argument '--foo' found error: unexpected argument '--foo' found
tip: to pass '--foo' as a value, use '-- --foo' tip: to pass '--foo' as a value, use '-- --foo'
@ -83,17 +84,17 @@ Usage: skip [OPTIONS] <LINES> [FILE]
For more information, try '--help'. For more information, try '--help'.
EOF EOF
cat<<EOF > test.expect cat <<EOF >test.expect
EOF EOF
touch test.out test.err touch test.out test.err
$SKIP --foo > test.out 2> test.err || true $SKIP --foo >test.out 2>test.err || true
$DIFF test.expect test.out $DIFF test.expect test.out
$DIFF test.expect.err test.err $DIFF test.expect.err test.err
rm test.expect test.out rm test.expect test.out
rm test.expect.err test.err rm test.expect.err test.err
echo "> handle ignore-extra when token is missing" echo "> handle ignore-extra when token is missing"
cat<<EOF > test.expect.err cat <<EOF >test.expect.err
error: the following required arguments were not provided: error: the following required arguments were not provided:
--token <TOKEN> --token <TOKEN>
<LINES> <LINES>
@ -102,17 +103,17 @@ Usage: skip --ignore-extras --token <TOKEN> <LINES> [FILE]
For more information, try '--help'. For more information, try '--help'.
EOF EOF
cat<<EOF > test.expect cat <<EOF >test.expect
EOF EOF
touch test.out test.err touch test.out test.err
$SKIP --ignore-extras > test.out 2> test.err || true $SKIP --ignore-extras >test.out 2>test.err || true
$DIFF test.expect test.out $DIFF test.expect test.out
$DIFF test.expect.err test.err $DIFF test.expect.err test.err
rm test.expect test.out rm test.expect test.out
rm test.expect.err test.err rm test.expect.err test.err
echo "> skip lines until 4 tokens seen - ignored extra tokens on same line" echo "> skip lines until 4 tokens seen - ignored extra tokens on same line"
cat<<EOF > test.in cat <<EOF >test.in
Lorem ipsum dolor sit amet, Lorem ipsum dolor sit amet,
consectetur adipiscing elit, consectetur adipiscing elit,
sed do eiusmod tempor incididunt sed do eiusmod tempor incididunt
@ -122,12 +123,12 @@ quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea laboris nisi ut aliquip ex ea
commodo consequat. commodo consequat.
EOF EOF
cat<<EOF > test.expect cat <<EOF >test.expect
quis nostrud exercitation ullamco quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea laboris nisi ut aliquip ex ea
commodo consequat. commodo consequat.
EOF EOF
$SKIP 4 test.in --token m --ignore-extras > test.out $SKIP 4 test.in --token m --ignore-extras >test.out
$DIFF test.expect test.out $DIFF test.expect test.out
rm test.in test.expect test.out rm test.in test.expect test.out