From 471f29bbdf318caf7363c069afdb385e3d61e66e Mon Sep 17 00:00:00 2001 From: Mirza Karacic Date: Sat, 4 Jan 2025 12:48:21 -0800 Subject: [PATCH] test --- .github/workflows/create-release.yaml | 9 +++------ .github/workflows/release.yaml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index f3275b581..c232072ef 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -7,18 +7,15 @@ on: type: string required: true description: New version to set - commit: - type: string - required: false - description: Commit of of which to build new version. If not provided will use HEAD - default: dev/dev-ci-fixes-stage # todo: Update this for after demo jobs: build-stage: name: Build stage uses: ./.github/workflows/release-stage.yaml with: - ref: ${{ inputs.commit }} + # This will need to change to point to staging branch + ref: dev/dev-ci-fixes-stage version: ${{ inputs.version }} build-number: ${{ github.run_number }} + is-snapshot: false secrets: inherit diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8fb2444e8..41205b5c1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -99,15 +99,15 @@ jobs: run: | echo "should commit" - #- name: Commit new version - # # Only committing version if this is a release and not snapshot build - # if: ${{ inputs.is-snapshot != true }} - # uses: stefanzweifel/git-auto-commit-action@v4 - # with: - # commit_message: 'Bumping version to ${{ inputs.version }} [skip ci]' - # commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - # tagging_message: Bumping version ${{ inputs.version }} - # branch: ${{ inputs.ref }} + - name: Commit new version + # Only committing version if this is a release and not snapshot build + if: ${{ inputs.is-snapshot != true }} + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: 'Bumping version to ${{ inputs.version }} [skip ci]' + commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + tagging_message: Bumping version ${{ inputs.version }} + branch: ${{ inputs.ref }} - name: Publish to JFrog uses: ./.github/actions/publish-to-jfrog