Skip to content

Commit

Permalink
Prepare for renaming master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
bocekm committed Nov 24, 2020
1 parent 5f8854e commit c2b73a5
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: test_coverage

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
test_coverage:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ env:
on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
pylint_check_2_6:
Expand Down
4 changes: 2 additions & 2 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
- job: copr_build
trigger: commit
actions:
# bump spec so we get release starting with 2 and hence all master builds will
# bump spec so we get release starting with 2 and hence all the default branch builds will
# have higher NVR than all the PR builds
post-upstream-clone:
- rpmdev-bumpspec --comment='latest upstream build' ./packaging/convert2rhel.spec
# do not get the version from a tag (git describe) but from the spec file
get-current-version:
- grep -oP '^Version:\s+\K\S+' packaging/convert2rhel.spec
metadata:
branch: master
branch: main
owner: "@oamg"
project: convert2rhel
targets:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ $ cd convert2rhel-distgit
$ fedpkg switch-branch el6 # for EPEL 6
$ fedpkg pull # make sure you work with the latest branch content
$ rm -rf convert2rhel* # remove all the files related to the previous release
$ wget https://raw.githubusercontent.com/oamg/convert2rhel/master/packaging/convert2rhel.spec
$ wget https://raw.githubusercontent.com/oamg/convert2rhel/main/packaging/convert2rhel.spec
$ spectool -g -A *.spec # download the new version tarball from GitHub
$ fedpkg new-sources *.tar.gz # upload the tarball to dist-git
$ fedpkg srpm
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ For details about this tool, please consult one of the following sources:
1. Run `man convert2rhel` once the tool is installed on your system

## Contributing
Contributions are welcome, please look over [CONTRIBUTING.md](https://github.com/oamg/convert2rhel/blob/master/CONTRIBUTING.md) for more information on how to get started.
Contributions are welcome, please look over [CONTRIBUTING.md](CONTRIBUTING.md) for more information on how to get started.

## Contact

Expand Down
2 changes: 1 addition & 1 deletion packaging/create_epel_srpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ TIMESTAMP=`date +%Y%m%d%H%MZ -u`
GIT_BRANCH=$(git for-each-ref --format='%(objectname) %(refname:short)' refs/heads | head -n1 | awk "{print \$2}")
GIT_BRANCH=${GIT_BRANCH////_} # Sanitize the git branch name (no "/" allowed for sed)
RELEASE="0"
[ "${GIT_BRANCH}" = "master" ] && RELEASE="100"
[ "${GIT_BRANCH}" = "main" ] && RELEASE="100"
if [ "$CHANGE_RELEASE" = true ]; then
# Suitable for Continous Delivery
sed -i "s/1%{?dist}/${RELEASE}.${TIMESTAMP}.${GIT_BRANCH}%{?dist}/g" ${SPECNAME}
Expand Down

0 comments on commit c2b73a5

Please sign in to comment.