Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dev-workflow-p1.yml #642

Merged
merged 2 commits into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/dev-workflow-p1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- review_requested
branches:
- 'dev*'
- 'dev-CICD'
- '2024-Pipeline-Improvement'
paths-ignore:
- 'docs/**'
Expand Down
86 changes: 43 additions & 43 deletions .github/workflows/dev-workflow-p2.yml
Original file line number Diff line number Diff line change
@@ -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