Skip to content

Commit

Permalink
Rename file VERSION.dev to .version-dev.
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-rapp committed Jul 7, 2024
1 parent 4159eb7 commit a2cded6
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/merge_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: ${{ github.event.release.target_commitish == 'main' }}
run: |
./build reset_development_version
git add VERSION.dev && git commit -m "[Bot] Update development version to $(cat VERSION.dev)." && git push origin main
git add .version-dev && git commit -m "[Bot] Update development version to $(cat .version-dev)." && git push origin main
- name: Merge into feature branch
if: ${{ github.event.release.target_commitish == 'main' }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
- name: Update development version
run: |
./build increment_development_version
git add VERSION.dev
git commit -m "[Bot] Update development version to $(cat VERSION.dev)."
git add .version-dev
git commit -m "[Bot] Update development version to $(cat .version-dev)."
git push
read_python_version:
name: Read Python version
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/developer_guide/coding_standards.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ We do not allow directly pushing to the above branches. Instead, all changes mus

Once modifications to one of the branches have been merged, {ref}`ci` jobs are used to automatically update downstream branches via pull requests. If all checks for such pull requests are successful, they are merged automatically. If there are any merge conflicts, they must be resolved manually. Following this procedure, changes to the feature brach are merged into the main branch (see `merge_feature.yml`), whereas changes to the bugfix branch are first merged into the feature branch and then into the main branch (see `merge_bugfix.yml`).

Whenever a new release has been published, the release branch is merged into the upstream branches (see `merge_release.yml`), i.e., major releases result in the feature and bugfix branches being updated, whereas minor releases result in the bugfix branch being updated. The version of the release branch and the affected branches are updated accordingly. The version of a branch is specified in the file `VERSION` in the project's root directory. Similarly, the file `VERSION.dev` is used to keep track of the version number used for development releases (see `release_development.yml`).
Whenever a new release has been published, the release branch is merged into the upstream branches (see `merge_release.yml`), i.e., major releases result in the feature and bugfix branches being updated, whereas minor releases result in the bugfix branch being updated. The version of the release branch and the affected branches are updated accordingly. The version of a branch is specified in the file `VERSION` in the project's root directory. Similarly, the file `.version-dev` is used to keep track of the version number used for development releases (see `release_development.yml`).

(dependencies)=

Expand Down
2 changes: 1 addition & 1 deletion scons/versioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

VERSION_FILE = 'VERSION'

DEV_VERSION_FILE = VERSION_FILE + '.dev'
DEV_VERSION_FILE = '.version-dev'

VERSION_FILE_ENCODING = 'utf-8'

Expand Down

0 comments on commit a2cded6

Please sign in to comment.