diff --git a/.github/template_gitref b/.github/template_gitref index f00523f05..82904ba9e 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-243-g0b216b2 +2021.08.26-246-g98b439a diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index 6d06c9894..c39aef5db 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -28,6 +28,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 1 + path: pulp_rpm - uses: actions/setup-python@v3 with: @@ -40,11 +41,13 @@ jobs: echo ::endgroup:: - name: Setting secrets + working-directory: pulp_rpm run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" env: SECRETS_CONTEXT: ${{ toJson(secrets) }} - name: Verify that branch name matches current version string on main branch + working-directory: pulp_rpm run: | X_Y_VERSION=$(grep version setup.py | sed -rn 's/version="(.*)\.0((a[0-9]+)|(b[0-9]+))?\.dev",/\1/p' | awk '{$1=$1};1') if [[ "$X_Y_VERSION" != "${{ inputs.name }}" ]] @@ -54,22 +57,26 @@ jobs: fi - name: Create ${{ inputs.name }} release branch + working-directory: pulp_rpm run: | git checkout -b ${{ inputs.name }} git push origin ${{ inputs.name }} - name: Bump version on main branch + working-directory: pulp_rpm run: | git checkout main bump2version --no-commit minor - name: Remove entries from CHANGES directory + working-directory: pulp_rpm run: | find CHANGES -type f -regex ".*\.\(bugfix\|doc\|feature\|misc\|deprecation\|removal\)" -exec git rm {} + - name: Make a PR with version bump and without CHANGES/* uses: peter-evans/create-pull-request@v4 with: + path: pulp_rpm token: ${{ secrets.RELEASE_TOKEN }} committer: pulpbot author: pulpbot