From 06d8d85fd7ad6b874828241188a9ef839192d7df Mon Sep 17 00:00:00 2001 From: teor Date: Mon, 12 Jun 2023 10:59:30 +1000 Subject: [PATCH 1/5] Add `fastmod --hidden` to mass-renames.md --- book/src/dev/mass-renames.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/book/src/dev/mass-renames.md b/book/src/dev/mass-renames.md index cd9eda6de01..d612a09e0cf 100644 --- a/book/src/dev/mass-renames.md +++ b/book/src/dev/mass-renames.md @@ -66,9 +66,11 @@ and ask the author to re-run the script on the latest `main`. You can use `fastmod` to rename some instances, but skip others: ```sh -fastmod --fixed-strings "OldName" "NewName" [paths to change] +fastmod --hidden --fixed-strings "OldName" "NewName" [paths to change] ``` +Using the `--hidden` flag does renames in `.github` workflows, issue templates, and other configs. + `fastmod` also supports regular expressions to replace a pattern with another pattern. Here's how to make a PR with these replacements: From 798f34c021d8f37ba1b2138997f2956d7c4b13cd Mon Sep 17 00:00:00 2001 From: teor Date: Tue, 13 Jun 2023 08:23:52 +1000 Subject: [PATCH 2/5] Do multiple skip paths --- book/src/dev/mass-renames.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/src/dev/mass-renames.md b/book/src/dev/mass-renames.md index d612a09e0cf..1e5714f51a6 100644 --- a/book/src/dev/mass-renames.md +++ b/book/src/dev/mass-renames.md @@ -19,7 +19,7 @@ xargs sed -i 's/OldName/NewName/g' Or excluding specific paths: ```sh git ls-tree --full-tree -r --name-only HEAD | \ -grep -v 'path-to-skip' | \ +grep -v -e 'path-to-skip' -e 'other-path-to-skip' | \ xargs sed -i 's/OldName/NewName/g' ``` From 1e67c44aa21a0f59ae21d9eda9e7f424a66d87dc Mon Sep 17 00:00:00 2001 From: teor Date: Tue, 13 Jun 2023 08:27:13 +1000 Subject: [PATCH 3/5] Do multiple sed renames in the same sed --- book/src/dev/mass-renames.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/book/src/dev/mass-renames.md b/book/src/dev/mass-renames.md index 1e5714f51a6..9240d873e7f 100644 --- a/book/src/dev/mass-renames.md +++ b/book/src/dev/mass-renames.md @@ -13,14 +13,14 @@ so changing them can lead to unexpected test failures or hangs. You can use `sed` to rename all the instances of a name in Zebra's code, documentation, and tests: ```sh git ls-tree --full-tree -r --name-only HEAD | \ -xargs sed -i 's/OldName/NewName/g' +xargs sed -i -e 's/OldName/NewName/g' -e 's/OtherOldName/OtherNewName/g' ``` Or excluding specific paths: ```sh git ls-tree --full-tree -r --name-only HEAD | \ grep -v -e 'path-to-skip' -e 'other-path-to-skip' | \ -xargs sed -i 's/OldName/NewName/g' +xargs sed -i -e 's/OldName/NewName/g' -e 's/OtherOldName/OtherNewName/g' ``` `sed` also supports regular expressions to replace a pattern with another pattern. @@ -47,7 +47,8 @@ git worktree add ../zebra-pr origin/pr-branch-name cd ../zebra-sed # run the scripts in the PR or commit message git ls-tree --full-tree -r --name-only HEAD | \ -xargs sed -i 's/OldName/NewName/g' +grep -v -e 'path-to-skip' -e 'other-path-to-skip' | \ +xargs sed -i -e 's/OldName/NewName/g' -e 's/OtherOldName/OtherNewName/g' cargo fmt --all ``` From 579bff08b55f8f79aa628283635958dc71876b31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 04:36:45 +0000 Subject: [PATCH 4/5] build(deps): bump bitflags from 2.3.1 to 2.3.2 Bumps [bitflags](https://github.com/bitflags/bitflags) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/bitflags/bitflags/releases) - [Changelog](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md) - [Commits](https://github.com/bitflags/bitflags/compare/2.3.1...2.3.2) --- updated-dependencies: - dependency-name: bitflags dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- zebra-chain/Cargo.toml | 2 +- zebra-network/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db9bd5f2143..406bac4579c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -470,9 +470,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" [[package]] name = "bitflags-serde-legacy" @@ -480,7 +480,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b64e60c28b6d25ad92e8b367801ff9aa12b41d05fc8798055d296bace4a60cc" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.3.2", "serde", ] @@ -5641,7 +5641,7 @@ dependencies = [ name = "zebra-chain" version = "1.0.0-beta.26" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.3.2", "bitflags-serde-legacy", "bitvec", "blake2b_simd", @@ -5746,7 +5746,7 @@ dependencies = [ name = "zebra-network" version = "1.0.0-beta.26" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.3.2", "byteorder", "bytes", "chrono", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index a3de6003887..54f13ecddd1 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -46,7 +46,7 @@ bench = ["zebra-test"] # Cryptography bitvec = "1.0.1" -bitflags = "2.2.1" +bitflags = "2.3.2" bitflags-serde-legacy = "0.1.1" blake2b_simd = "1.0.1" blake2s_simd = "1.0.1" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 339086a9c2f..a99f5bd839e 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -36,7 +36,7 @@ progress-bar = [ proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"] [dependencies] -bitflags = "2.2.1" +bitflags = "2.3.2" byteorder = "1.4.3" bytes = "1.4.0" chrono = { version = "0.4.26", default-features = false, features = ["clock", "std"] } From 28b51a40bee33cd394efe7c90986428974f4e152 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 15:56:46 +0000 Subject: [PATCH 5/5] build(deps): bump tj-actions/changed-files from 36.1.0 to 36.2.1 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 36.1.0 to 36.2.1. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v36.1.0...v36.2.1) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a8ec87324a5..71e61543557 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -37,7 +37,7 @@ jobs: - name: Rust files id: changed-files-rust - uses: tj-actions/changed-files@v36.1.0 + uses: tj-actions/changed-files@v36.2.1 with: files: | **/*.rs @@ -49,7 +49,7 @@ jobs: - name: Workflow files id: changed-files-workflows - uses: tj-actions/changed-files@v36.1.0 + uses: tj-actions/changed-files@v36.2.1 with: files: | .github/workflows/*.yml