Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
FooBarWidget committed Jul 21, 2024
1 parent 28438d6 commit ba648ba
Show file tree
Hide file tree
Showing 7 changed files with 301 additions and 385 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/ci-cd-build-packages-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@
name: 'CI/CD: build packages [1]'

on:
workflow_dispatch:
inputs:
ci_artifacts_run_number:
required: false
type: string
description: Run number for CI artifacts
workflow_call:
inputs:
ci_artifacts_run_number:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/ci-cd-build-packages-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@
name: 'CI/CD: build packages [2]'

on:
workflow_dispatch:
inputs:
ci_artifacts_run_number:
required: false
type: string
description: Run number for CI artifacts
workflow_call:
inputs:
ci_artifacts_run_number:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/ci-cd-build-packages.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
name: 'CI/CD: build packages [<%= part_number %>]'

on:
workflow_dispatch:
inputs:
ci_artifacts_run_number:
required: false
type: string
description: Run number for CI artifacts
workflow_call:
inputs:
ci_artifacts_run_number:
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/ci-cd-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1399,3 +1399,28 @@ jobs:
if: |
needs.consolidate_1.result == 'success'
&& !failure() && !cancelled()
publish_test:
name: Publish & test against test repos
needs:
- determine_necessary_jobs
- consolidate_1

- build_packages_1

- build_packages_2

uses: ./.github/workflows/ci-cd-publish-test-test.yml
permissions:
id-token: write
packages: read
secrets: inherit
with:
ci_artifacts_run_number: ${{ needs.consolidate_1.outputs.ci_artifacts_run_number }}
necessary_jobs: ${{ needs.determine_necessary_jobs.outputs.necessary_jobs }}
# Run even if a transitively dependent job has been skipped
if: |
needs.consolidate_1.result == 'success'
&& build_packages_1.result == 'success'
&& build_packages_2.result == 'success'
&& !failure() && !cancelled()
24 changes: 24 additions & 0 deletions .github/workflows/ci-cd-main.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -896,3 +896,27 @@ jobs:
&& !failure() && !cancelled()
<%- end -%>
<%- end %>

publish_test:
name: Publish & test against test repos
needs:
- determine_necessary_jobs
- consolidate_1
<%- distribution_buckets.size.times do |i| %>
- build_packages_<%= i + 1 %>
<%- end %>
uses: ./.github/workflows/ci-cd-publish-test-test.yml
permissions:
id-token: write
packages: read
secrets: inherit
with:
ci_artifacts_run_number: ${{ needs.consolidate_1.outputs.ci_artifacts_run_number }}
necessary_jobs: ${{ needs.determine_necessary_jobs.outputs.necessary_jobs }}
# Run even if a transitively dependent job has been skipped
if: |
needs.consolidate_1.result == 'success'
<%- distribution_buckets.size.times do |i| -%>
&& build_packages_<%= i + 1 %>.result == 'success'
<%- end -%>
&& !failure() && !cancelled()
Loading

0 comments on commit ba648ba

Please sign in to comment.