diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index f4dc9b7..a37084a 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -1,16 +1,43 @@ -name: Bump version +name: Update file on PR merge on: - push: + pull_request: branches: - main + types: closed + jobs: - build: + update_version: + if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: checkout + uses: actions/checkout@v3 + with: + # Fetch full depth, otherwise the last step overwrites the last commit's parent, essentially removing the graph. + fetch-depth: 0 + + - name: GenerateTag + id: name_tag + uses: mathieudutour/github-tag-action@v6.1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + create_annotated_tag: true + default_bump: patch + dry_run: true + tag_prefix: manic- + - name: Update version.txt + run: | + echo "${{ steps.name_tag.outputs.new_tag }}" > version.txt + - name: Amend the last commit + run: | + git config --global user.email "gitbot@openrct2.org" + git config --global user.name "OpenRCT2 git bot" + git commit -a --amend --no-edit + git push --force-with-lease + echo "Complete"name: Bump version - name: Bump version and push tag - id: tag_version - uses: mathieudutour/github-tag-action@v5.5 + id: really_tag_version + uses: mathieudutour/github-tag-action@v6.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} create_annotated_tag: true diff --git a/checkout_externals b/checkout_externals index 48bce24..536c64e 100755 --- a/checkout_externals +++ b/checkout_externals @@ -12,7 +12,7 @@ from __future__ import print_function import sys import traceback - +import os import manic if sys.hexversion < 0x02070000: @@ -26,6 +26,13 @@ if sys.hexversion < 0x02070000: if __name__ == '__main__': ARGS = manic.checkout.commandline_arguments() + if ARGS.version: + version_info = '' + version_file_path = os.path.join(os.path.dirname(__file__),'version.txt') + with open(version_file_path) as f: + version_info = f.readlines()[0].strip() + print(version_info) + sys.exit(0) try: RET_STATUS, _ = manic.checkout.main(ARGS) sys.exit(RET_STATUS) diff --git a/manic/checkout.py b/manic/checkout.py index 3f5537a..25c05ea 100755 --- a/manic/checkout.py +++ b/manic/checkout.py @@ -304,6 +304,9 @@ def commandline_arguments(args=None): 'used up to two times, increasing the ' 'verbosity level each time.') + parser.add_argument('--version', action='store_true', default=False, + help='Print manage_externals version and exit.') + parser.add_argument('--svn-ignore-ancestry', action='store_true', default=False, help='By default, subversion will abort if a component is ' 'already checked out and there is no common ancestry with ' diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..cbda54c --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +manic-1.2.24-3-gba00e50