Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
carl-adams-planet committed Dec 18, 2024
1 parent 7166e1d commit fdceff1
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
14 changes: 13 additions & 1 deletion .github/actions/version-dot-buildnum-generate/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,20 @@ inputs:

outputs:
version-with-buildnum:
description: 'Version with variant build number appended'
description: 'Full version with variant build number appended'
value: ${{ steps.generate-version-with-buildnum.output.version-with-buildnum }}
version:
description: 'Just the simple branch invariant version'
value: ${{ steps.generate-version-with-buildnum.output.version }}
buildnum:
description: 'Just the generated build number'
value: ${{ steps.generate-version-with-buildnum.output.buildnum }}
variant-normal:
description: 'Normalized build variant string'
value: ${{ steps.generate-version-with-buildnum.output.variant-normal }}
variant-raw:
description: 'Raw build variant string (same as input)'
value: ${{ steps.generate-version-with-buildnum.output.variant-raw }}

runs:
using: "composite"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-orchestrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: "Generate version-with-buildnum.txt file"
id: gen-build-num
id: gen-buildnum
uses: ./.github/actions/version-dot-buildnum-generate
with:
build-variant: ${{ inputs.workflow-build-variant }}
Expand All @@ -53,13 +53,13 @@ jobs:
git config --global user.email "[email protected]"
git config --global user.name "CICD for github repository ${GITHUB_REPOSITORY}"
git config --list --show-origin
if [ "${{ steps.gen-build-num.outputs.variant-raw }}" = "release" ]
if [ "${{ steps.gen-buildnum.outputs.variant-raw }}" = "release" ]
then
git tag -a -m "test tag comment" "${{steps.gen-build-num.outputs.version}}"
git push origin "${{steps.gen-build-num.outputs.version}}"
git tag -a -m "test tag comment for final release" "${{steps.gen-buildnum.outputs.version}}"
git push origin "${{steps.gen-buildnum.outputs.version}}"
fi
git tag -a -m "test tag comment" "${{steps.gen-build-num.outputs.version-with-buildnum}}"
git push origin "${{steps.gen-build-num.outputs.version-with-buildnum}}"
git tag -a -m "test tag comment" "${{steps.gen-buildnum.outputs.version-with-buildnum}}"
git push origin "${{steps.gen-buildnum.outputs.version-with-buildnum}}"
test:
name: "Prerelease Tests"
uses: ./.github/workflows/test.yml
Expand Down

0 comments on commit fdceff1

Please sign in to comment.