diff --git a/.github/template_gitref b/.github/template_gitref index 2a9aa1bcbc..61af0abf53 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-244-g7bb934c +2021.08.26-245-gdbdef2f diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index f4d36b1c76..be686d1d6a 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -26,6 +26,7 @@ jobs: steps: - uses: actions/checkout@v3 + path: pulpcore with: fetch-depth: 1 @@ -40,11 +41,13 @@ jobs: echo ::endgroup:: - name: Setting secrets + working-directory: pulpcore 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: pulpcore 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,16 +57,19 @@ jobs: fi - name: Create ${{ inputs.name }} release branch + working-directory: pulpcore run: | git checkout -b ${{ inputs.name }} git push origin ${{ inputs.name }} - name: Bump version on main branch + working-directory: pulpcore run: | git checkout main bump2version --no-commit minor - name: Remove entries from CHANGES directory + working-directory: pulpcore run: | find CHANGES -type f -regex ".*\.\(bugfix\|doc\|feature\|misc\|deprecation\|removal\)" -exec git rm {} + @@ -83,6 +89,7 @@ jobs: - name: Make a PR with version bump and without CHANGES/* uses: peter-evans/create-pull-request@v4 with: + path: pulpcore token: ${{ secrets.RELEASE_TOKEN }} committer: pulpbot author: pulpbot diff --git a/docs/template_gitref b/docs/template_gitref index 2a9aa1bcbc..61af0abf53 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-244-g7bb934c +2021.08.26-245-gdbdef2f