This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8b15f8f22e8126f527ba0d39b9d13b20577c0192 Author: Brandon Williams <[email protected]> AuthorDate: Fri Jan 28 11:08:07 2022 -0600 Fix line numbering and add final step to readme patch by Brandon Williams; reviewed by Brandon Williams, Ekaterina Dimitrova for CASSANDRA-17319 --- .circleci/readme.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/readme.md b/.circleci/readme.md index ab7d5a9..9ab60d5 100644 --- a/.circleci/readme.md +++ b/.circleci/readme.md @@ -92,27 +92,28 @@ again or use the `-l`/`-m`/`-h` script flags. Read below for details how to generate the files manually without the `generate.sh` script: 1. make your edits to config-2_1.yml - let it stay at lowres settings -1. generate a valid LOWRES file: +2. generate a valid LOWRES file: `circleci config process config-2_1.yml > config.yml.LOWRES` -1. add the Apache license header to the newly created LOWRES file: +3. add the Apache license header to the newly created LOWRES file: `cat license.yml config.yml.LOWRES > config.yml.LOWRES.new && mv config.yml.LOWRES.new config.yml.LOWRES` -1. then apply the highres patch to config-2_1.yml; +4. then apply the highres patch to config-2_1.yml; `patch -o config-2_1.yml.HIGHRES config-2_1.yml config-2_1.yml.high_res.patch` (this creates a new file `config-2_1.yml.HIGHRES` instead of in-place patching config-2_1.yml) Note that if the patch no longer applies to `config-2_1.yml` a new patch file is needed, do this by manually making `config-2_1.yml` high resource and create the patch file based on the diff (don't commit it though). -1. generate the HIGHRES file: +5. generate the HIGHRES file: `circleci config process config-2_1.yml.HIGHRES > config.yml.HIGHRES` -1. remove the temporary patched HIGHRES file: `rm config-2_1.yml.HIGHRES` -1. add the Apache license header to the newly created HIGHRES file: +6. remove the temporary patched HIGHRES file: `rm config-2_1.yml.HIGHRES` +7. add the Apache license header to the newly created HIGHRES file: `cat license.yml config.yml.HIGHRES > config.yml.HIGHRES.new && mv config.yml.HIGHRES.new config.yml.HIGHRES` -1. repeat the last steps to generate the MIDRES file: +8. repeat the last steps to generate the MIDRES file: ``` patch -o config-2_1.yml.MIDRES config-2_1.yml config-2_1.yml.mid_res.patch circleci config process config-2_1.yml.MIDRES > config.yml.MIDRES rm config-2_1.yml.MIDRES cat license.yml config.yml.MIDRES > config.yml.MIDRES.new && mv config.yml.MIDRES.new config.yml.MIDRES ``` +9. finally, remember to update the config.yml --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
