diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index f79144fe..daee8c11 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -11,6 +11,7 @@ on: - review_requested branches: - 'dev*' + - 'dev-CICD' - '2024-Pipeline-Improvement' paths-ignore: - 'docs/**' diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 7427ec97..31a345b6 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -1,43 +1,43 @@ -name: Dev workflow (part 2) - -on: - pull_request_target: - branches: - - 'dev*' - types: - - closed - workflow_dispatch: - -jobs: - bump-dev-number: - if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} - uses: ./.github/workflows/bump-version.yml - with: - change: 'bump-dev-num' - secrets: inherit - - rebuild-artifacts-with-new-dev-num: - needs: bump-dev-number - name: Rebuild artifacts with new dev number - uses: ./.github/workflows/build-artifacts.yml - with: - # On pull_request_target, the bump version commit will be ignored - # So we must pass it manually to the workflow - sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} - secrets: inherit - - upload-to-jfrog: - name: Upload artifacts to JFrog - needs: [ - bump-dev-number, - rebuild-artifacts-with-new-dev-num - ] - uses: ./.github/workflows/upload-to-jfrog.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit - - # We don't want the artifacts in JFrog to also exist in Github - delete-artifacts: - needs: upload-to-jfrog - uses: ./.github/workflows/delete-artifacts.yml +#name: Dev workflow (part 2) +# +#on: +# pull_request_target: +# branches: +# - 'dev*' +# types: +# - closed +# workflow_dispatch: +# +#jobs: +# bump-dev-number: +# if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} +# uses: ./.github/workflows/bump-version.yml +# with: +# change: 'bump-dev-num' +# secrets: inherit +# +# rebuild-artifacts-with-new-dev-num: +# needs: bump-dev-number +# name: Rebuild artifacts with new dev number +# uses: ./.github/workflows/build-artifacts.yml +# with: +# # On pull_request_target, the bump version commit will be ignored +# # So we must pass it manually to the workflow +# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} +# secrets: inherit +# +# upload-to-jfrog: +# name: Upload artifacts to JFrog +# needs: [ +# bump-dev-number, +# rebuild-artifacts-with-new-dev-num +# ] +# uses: ./.github/workflows/upload-to-jfrog.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit +# +# # We don't want the artifacts in JFrog to also exist in Github +# delete-artifacts: +# needs: upload-to-jfrog +# uses: ./.github/workflows/delete-artifacts.yml