Compare commits

...

18 commits
v0.2.1 ... main

Author SHA1 Message Date
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
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
7 changed files with 105 additions and 86 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.1.0
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.1.0
with:
args: ${{ matrix.toolchain.name }} cargo clippy
- name: Build
uses: https://git.kemitix.net/kemitix/rust@v2.1.0
with:
args: ${{ matrix.toolchain.name }} cargo build
- name: Test
uses: https://git.kemitix.net/kemitix/rust@v2.1.0
with:
args: ${{ matrix.toolchain.name }} cargo test --no-fail-fast
- name: Integration
uses: https://git.kemitix.net/kemitix/rust@v2.1.0
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.81.0"
- &slow_check_paths - &slow_check_paths
- path: - path:
# rust source code # rust source code
@ -14,28 +14,18 @@ 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:
- wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz - wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz
- tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz - tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz
- cp cargo-binstall /usr/local/cargo/bin - rm cargo-binstall-x86_64-unknown-linux-musl.tgz
- mv cargo-binstall /usr/local/cargo/bin
- cargo binstall -y cargo-machete - cargo binstall -y cargo-machete
- cargo machete - cargo machete
@ -46,51 +36,11 @@ 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:
- cargo login "$CARGO_REGISTRY_TOKEN" - cargo login "$CARGO_REGISTRY_TOKEN"
- cargo publish --registry crates-io --no-verify --allow-branch "${CI_COMMIT_TAG}" --yes - cargo publish --registry crates-io --no-verify
secrets: [cargo_api_token] secrets: [cargo_registry_token]
when: when:
event: tag event: tag

2
Cargo.lock generated
View file

@ -122,7 +122,7 @@ dependencies = [
[[package]] [[package]]
name = "skip" name = "skip"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"clap", "clap",
] ]

View file

@ -1,7 +1,15 @@
[package] [package]
name = "skip" name = "skip"
version = "0.2.0" version = "0.2.1"
edition = "2021" edition = "2021"
authors = ["Paul Campbell <pcampbell@kemitix.net>"]
categories = ["command-line-utilities"]
description = "Skip lines in a file"
license = "MIT"
repository = "https://git.kemitix.net/kemitix/skip"
keywords = ["skip", "lines", "file", "text", "utility"]
rust-version = "1.74.1"
exclude = [".cargo_home"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -2,13 +2,17 @@
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.
Additionally, it can check for whole lines matching, Additionally, it can check for whole lines matching,
or for a token being present on the line. or for a token being present on the line.
N.B.: The `skip` crate used to be an implementation of [Skip list](https://en.wikipedia.org/wiki/Skip_list),
by [Luo Jia / Zhouqi Jiang](https://github.com/luojia65) ([source](https://github.com/luojia65/skip)).
That crate will be republished as [skip-list](https://crates.io/crates/skip-list) (soon).
## Usage ## Usage
### Skip a fixed number of lines ### Skip a fixed number of lines

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"
}
] ]
} }

View file

@ -5,7 +5,7 @@ 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
@ -14,7 +14,8 @@ if test ! -x $SKIP ; then
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