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 5246ff7 commit df6bb08
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 31 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/ci-cd-build-packages-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ jobs:
build_ruby_el_9-3_3-normal:
name: 'Ruby [el-9/3.3/normal]'
needs:
- determine_necessary_jobs

runs-on: ubuntu-24.04
environment: test
Expand Down Expand Up @@ -199,7 +198,6 @@ jobs:
build_ruby_el_9-3_3-jemalloc:
name: 'Ruby [el-9/3.3/jemalloc]'
needs:
- determine_necessary_jobs

- build_jemalloc_el_9
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -306,7 +304,6 @@ jobs:
build_ruby_el_9-3_3-malloctrim:
name: 'Ruby [el-9/3.3/malloctrim]'
needs:
- determine_necessary_jobs

runs-on: ubuntu-24.04
environment: test
Expand Down Expand Up @@ -401,7 +398,6 @@ jobs:
build_ruby_el_9-3_3_4-normal:
name: 'Ruby [el-9/3.3.4/normal]'
needs:
- determine_necessary_jobs

runs-on: ubuntu-24.04
environment: test
Expand Down Expand Up @@ -496,7 +492,6 @@ jobs:
build_ruby_el_9-3_3_4-jemalloc:
name: 'Ruby [el-9/3.3.4/jemalloc]'
needs:
- determine_necessary_jobs

- build_jemalloc_el_9
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -603,7 +598,6 @@ jobs:
build_ruby_el_9-3_3_4-malloctrim:
name: 'Ruby [el-9/3.3.4/malloctrim]'
needs:
- determine_necessary_jobs

runs-on: ubuntu-24.04
environment: test
Expand Down Expand Up @@ -702,7 +696,6 @@ jobs:
finalize:
name: Finalize
needs:
- determine_necessary_jobs

- build_jemalloc_el_9

Expand Down Expand Up @@ -797,17 +790,14 @@ jobs:
### Check whether dependent jobs failed ###
# Only trigger next workflow if there are no failures.

- name: Check whether 'Determine necessary jobs' succeeded
run: 'false'
if: needs.determine_necessary_jobs.result != 'success'
- name: Check whether 'Build Jemalloc' did not fail
- name: Check whether 'Jemalloc' job did not fail
run: 'false'
if: |
false
|| (needs.build_jemalloc_el_9.result != 'success'
&& (needs.build_jemalloc_el_9.result != 'skipped'
|| contains(github.event.inputs.necessary_jobs, ';Build Jemalloc [el-9];')))
- name: Check whether 'Build Ruby [el-9]' did not fail
- name: Check whether 'Ruby [el-9]' job did not fail
run: 'false'
if: |
false
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/ci-cd-build-packages-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ jobs:
build_ruby_debian_12-3_3-normal:
name: 'Ruby [debian-12/3.3/normal]'
needs:
- determine_necessary_jobs

runs-on: ubuntu-24.04
environment: test
Expand Down Expand Up @@ -199,7 +198,6 @@ jobs:
build_ruby_debian_12-3_3-jemalloc:
name: 'Ruby [debian-12/3.3/jemalloc]'
needs:
- determine_necessary_jobs

- build_jemalloc_debian_12
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -306,7 +304,6 @@ jobs:
build_ruby_debian_12-3_3-malloctrim:
name: 'Ruby [debian-12/3.3/malloctrim]'
needs:
- determine_necessary_jobs

runs-on: ubuntu-24.04
environment: test
Expand Down Expand Up @@ -401,7 +398,6 @@ jobs:
build_ruby_debian_12-3_3_4-normal:
name: 'Ruby [debian-12/3.3.4/normal]'
needs:
- determine_necessary_jobs

runs-on: ubuntu-24.04
environment: test
Expand Down Expand Up @@ -496,7 +492,6 @@ jobs:
build_ruby_debian_12-3_3_4-jemalloc:
name: 'Ruby [debian-12/3.3.4/jemalloc]'
needs:
- determine_necessary_jobs

- build_jemalloc_debian_12
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -603,7 +598,6 @@ jobs:
build_ruby_debian_12-3_3_4-malloctrim:
name: 'Ruby [debian-12/3.3.4/malloctrim]'
needs:
- determine_necessary_jobs

runs-on: ubuntu-24.04
environment: test
Expand Down Expand Up @@ -702,7 +696,6 @@ jobs:
finalize:
name: Finalize
needs:
- determine_necessary_jobs

- build_jemalloc_debian_12

Expand Down Expand Up @@ -797,17 +790,14 @@ jobs:
### Check whether dependent jobs failed ###
# Only trigger next workflow if there are no failures.

- name: Check whether 'Determine necessary jobs' succeeded
run: 'false'
if: needs.determine_necessary_jobs.result != 'success'
- name: Check whether 'Build Jemalloc' did not fail
- name: Check whether 'Jemalloc' job did not fail
run: 'false'
if: |
false
|| (needs.build_jemalloc_debian_12.result != 'success'
&& (needs.build_jemalloc_debian_12.result != 'skipped'
|| contains(github.event.inputs.necessary_jobs, ';Build Jemalloc [debian-12];')))
- name: Check whether 'Build Ruby [debian-12]' did not fail
- name: Check whether 'Ruby [debian-12]' job did not fail
run: 'false'
if: |
false
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/ci-cd-build-packages.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ jobs:
build_ruby_<%= slug(distribution[:name]) %>-<%= slug(ruby_package_version[:id]) %>-<%= slug(variant[:name]) %>:
name: 'Ruby [<%= distribution[:name] %>/<%= ruby_package_version[:id] %>/<%= variant[:name] %>]'
needs:
- determine_necessary_jobs
<% if variant[:name] == 'jemalloc' %>
<%- unindent(2) do -%>
- build_jemalloc_<%= slug(distribution[:name]) %>
Expand Down Expand Up @@ -222,7 +221,6 @@ jobs:
finalize:
name: Finalize
needs:
- determine_necessary_jobs
<%- distributions.each do |distribution| -%>
<%- unindent(2) do %>
- build_jemalloc_<%= slug(distribution[:name]) %>
Expand Down Expand Up @@ -293,10 +291,7 @@ jobs:
### Check whether dependent jobs failed ###
# Only trigger next workflow if there are no failures.

- name: Check whether 'Determine necessary jobs' succeeded
run: 'false'
if: needs.determine_necessary_jobs.result != 'success'
- name: Check whether 'Build Jemalloc' did not fail
- name: Check whether 'Jemalloc' job did not fail
run: 'false'
if: |
false
Expand All @@ -306,7 +301,7 @@ jobs:
|| contains(github.event.inputs.necessary_jobs, ';Build Jemalloc [<%= distribution[:name] %>];')))
<%- end -%>
<%- distributions.each do |distribution| -%>
- name: Check whether 'Build Ruby [<%= distribution[:name] %>]' did not fail
- name: Check whether 'Ruby [<%= distribution[:name] %>]' job did not fail
run: 'false'
if: |
false
Expand Down

0 comments on commit df6bb08

Please sign in to comment.