Skip to content

Commit

Permalink
more feature fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilDigitalJustice committed Jan 22, 2025
1 parent 0d65033 commit 26f965a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
18 changes: 6 additions & 12 deletions .github/workflows/feature-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,13 @@ jobs:
define-image-tag:
runs-on: ubuntu-latest
outputs:
tag_name: ${{ steps.extract_tag_name.outputs.tag_name }}
repo_name: ${{ steps.extract_repo_name.outputs.repo_name }}
steps:
- uses: actions/checkout@v3
- name: Extract short repo name
shell: bash
run: echo "repo_name=caab-ebs${GITHUB_REPOSITORY#*\/laa-ccms-data}" >> $GITHUB_OUTPUT
id: extract_repo_name

- name: Extract branch name and commit hash
id: extract_tag_name
shell: bash
run: |
BRANCH_NAME=${GITHUB_REF_NAME#feature-*/}
COMMIT_HASH=$(git rev-parse --short HEAD)
echo "tag_name=${BRANCH_NAME}-${COMMIT_HASH}-SNAPSHOT" >> $GITHUB_OUTPUT
build-test-publish:
runs-on: ubuntu-latest
outputs:
Expand Down Expand Up @@ -70,8 +60,12 @@ jobs:
shell: bash
id: capture_version
run: |
echo "app_version=${{ needs.define-image-tag.outputs.tag_name }}" >> $GITHUB_OUTPUT
echo "Captured version: ${{ needs.define-image-tag.outputs.tag_name }}"
BRANCH_NAME=${GITHUB_REF_NAME#feature-*/}
COMMIT_HASH=$(git rev-parse --short HEAD)
echo "${BRANCH_NAME}"
echo "${COMMIT_HASH}"
echo "${BRANCH_NAME}-${COMMIT_HASH}-SNAPSHOT"
echo "app_version=${BRANCH_NAME}-${COMMIT_HASH}-SNAPSHOT" >> $GITHUB_OUTPUT
- name: Upload jarfile
uses: actions/upload-artifact@v3
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/push-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ on:
push:
branches-ignore:
- main
- feature-*
- 'feature-dev/*'
- 'feature-test/*'

permissions:
contents: read
Expand Down

0 comments on commit 26f965a

Please sign in to comment.