Skip to content

Commit

Permalink
Merge pull request #57 from ONSdigital/development
Browse files Browse the repository at this point in the history
Fix: Remove branch check for deployment
  • Loading branch information
diego-ons authored Feb 28, 2024
2 parents ca18405 + f98b071 commit 72b0269
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.3
current_version = 0.1.4
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/version_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0 # Necessary to fetch all history for tags and branches

- name: Check branch name
run: |
BRANCH_NAME="${{ github.head_ref }}"
echo "Branch name is: $BRANCH_NAME"
if [ "$BRANCH_NAME" != "development" ]; then
echo "::error ::Pull requests can only be merged from the 'development' branch into 'main'. Your branch is named '$BRANCH_NAME'."
exit 1
fi
shell: bash

# ToDO: need to check github.head_ref giving an empty string on action.
# - name: Check branch name
# run: |
# BRANCH_NAME="${{ github.head_ref }}"
# echo "Branch name is: $BRANCH_NAME"
# if [ "$BRANCH_NAME" != "development" ]; then
# echo "::error ::Pull requests can only be merged from the 'development' branch into 'main'. Your branch is named '$BRANCH_NAME'."
# exit 1
# fi
# shell: bash

- name: Extract versions and compare
run: |
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ and this project adheres to [semantic versioning](https://semver.org/spec/v2.0.0

### Removed

## [v0.1.4] - 2024-02-28

### Added

### Changed

### Deprecated

### Fixed

- Remove check of branch for deployment.


## [v0.1.3] - 2024-02-28

### Added
Expand Down Expand Up @@ -122,6 +135,8 @@ and this project adheres to [semantic versioning](https://semver.org/spec/v2.0.0

### Release Links

RDSA-utils [v0.1.4](https://github.com/ONSdigital/rdsa-utils/releases/tag/0.1.4)

RDSA-utils [v0.1.3](https://github.com/ONSdigital/rdsa-utils/releases/tag/0.1.3)

RDSA-utils [v0.1.2](https://github.com/ONSdigital/rdsa-utils/releases/tag/0.1.2)
Expand Down
2 changes: 1 addition & 1 deletion rdsa_utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.3'
__version__ = '0.1.4'

0 comments on commit 72b0269

Please sign in to comment.