rpms/lorax-templates-rhel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

README: Update README with note about PREV=

Browse Source 
and change branch reference to c10s

Related: RHEL-40021
This commit is contained in:
Brian C. Lane 2024-06-05 15:05:16 -07:00
parent f32b22a68b
commit 25f72cecca
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -5,6 +5,8 @@ Hi there! If you're trying to fix something here, do the following:
3. `make release` 3. `make release`
This will bump the release, update the spec with changes in this branch, This will bump the release, update the spec with changes in this branch,
create a new tarball, upload it, and commit the changes. create a new tarball, upload it, and commit the changes.
NOTE: If there are commits on c10s since the last build you need to set PREV=<HASH>
so that the changelog will be correct. eg. PREV=ACTUALHASH make release
4. Examine the changes with 'git show' and make sure they look ok. 4. Examine the changes with 'git show' and make sure they look ok.
5. Push the changes to your fork of the project with: 5. Push the changes to your fork of the project with:
'git push REMOTE BRANCHNAME' and follow the instructions to 'git push REMOTE BRANCHNAME' and follow the instructions to
@ -12,7 +14,7 @@ Hi there! If you're trying to fix something here, do the following:
# To rebase from RHEL: # To rebase from RHEL:
1. Add "cs" remote: `git remote add cs https://gitlab.com/redhat/centos-stream/rpms/lorax-templates-rhel.git` 1. Add "cs" remote: `git remote add cs https://gitlab.com/redhat/centos-stream/rpms/lorax-templates-rhel.git`
2. `git merge [-X ours] cs/c9s` 2. `git merge [-X ours] cs/c10s`
3. `make release-merge` 3. `make release-merge`
4. Edit the %changelog section of lorax-templates-rhel.spec appropriately 4. Edit the %changelog section of lorax-templates-rhel.spec appropriately
5. `git add lorax-templates-rhel.spec` 5. `git add lorax-templates-rhel.spec`