Skip to content

Commit

Permalink
Update dev-workflow-p2.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
DomPeliniAerospike committed Nov 16, 2024
1 parent cd8aefe commit e1c0dc4
Showing 1 changed file with 43 additions and 43 deletions.
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

0 comments on commit e1c0dc4

Please sign in to comment.