Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add version.txt and github workflow to update file. #208

Merged
merged 7 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions .github/workflows/bumpversion.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
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 "[email protected]"
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
Expand Down
9 changes: 8 additions & 1 deletion checkout_externals
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ from __future__ import print_function

import sys
import traceback

import os
import manic

if sys.hexversion < 0x02070000:
Expand All @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions manic/checkout.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down
1 change: 1 addition & 0 deletions version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
manic-1.2.24-3-gba00e50
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this going to get cleaned up when it is tagged?
I.s., will it be manic-1.2.25 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it will be manic-1.2.25.

Loading