From feffc3f1c07682a792ca623a47aaab32f98dc3ba Mon Sep 17 00:00:00 2001 From: BenGoldberger Date: Sun, 25 May 2025 11:18:13 +0300 Subject: [PATCH 1/7] add to workflows --- .github/workflows/debian11.yml | 6 ++++++ .github/workflows/event-nightly.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/debian11.yml b/.github/workflows/debian11.yml index d06e417a8..ad3c5f84b 100644 --- a/.github/workflows/debian11.yml +++ b/.github/workflows/debian11.yml @@ -8,3 +8,9 @@ jobs: with: container: debian:bullseye pre-checkout-script: apt-get update && apt-get -y install git + + bullseye-gcc11: + uses: ./.github/workflows/task-unit-test.yml + with: + container: gcc:11-bullseye + pre-checkout-script: apt-get update && apt-get -y install git diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml index 1281bae40..ef9723d2d 100644 --- a/.github/workflows/event-nightly.yml +++ b/.github/workflows/event-nightly.yml @@ -49,6 +49,7 @@ jobs: - focal # - bionic - bullseye + - bullseye-gcc11 # - amazonlinux2 - mariner2 - rocky8 From 6b98c5c6394da57eaea7108d48badb682a23a1b5 Mon Sep 17 00:00:00 2001 From: BenGoldberger Date: Sun, 25 May 2025 11:32:21 +0300 Subject: [PATCH 2/7] add to merge-queue --- .github/workflows/event-merge-to-queue.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/event-merge-to-queue.yml b/.github/workflows/event-merge-to-queue.yml index 3a8e53b3f..22d0ba707 100644 --- a/.github/workflows/event-merge-to-queue.yml +++ b/.github/workflows/event-merge-to-queue.yml @@ -49,6 +49,7 @@ jobs: - focal # - bionic - bullseye + - bullseye-gcc11 # - amazonlinux2 - mariner2 - rocky8 From 7ba47cf88523ac58479ad5964d46c26249669a6b Mon Sep 17 00:00:00 2001 From: BenGoldberger Date: Mon, 26 May 2025 15:09:17 +0300 Subject: [PATCH 3/7] remove run from merge-to-queue --- .github/workflows/event-merge-to-queue.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/event-merge-to-queue.yml b/.github/workflows/event-merge-to-queue.yml index 22d0ba707..3a8e53b3f 100644 --- a/.github/workflows/event-merge-to-queue.yml +++ b/.github/workflows/event-merge-to-queue.yml @@ -49,7 +49,6 @@ jobs: - focal # - bionic - bullseye - - bullseye-gcc11 # - amazonlinux2 - mariner2 - rocky8 From 1cf96ad0972a669277a226512c3c492976300241 Mon Sep 17 00:00:00 2001 From: BenGoldberger Date: Mon, 26 May 2025 15:59:31 +0300 Subject: [PATCH 4/7] move flow to different file --- .github/workflows/debian-bullseye-gcc11.yml | 11 +++++++++++ .github/workflows/debian11.yml | 6 ------ .github/workflows/event-nightly.yml | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/debian-bullseye-gcc11.yml diff --git a/.github/workflows/debian-bullseye-gcc11.yml b/.github/workflows/debian-bullseye-gcc11.yml new file mode 100644 index 000000000..f9ef2e1bb --- /dev/null +++ b/.github/workflows/debian-bullseye-gcc11.yml @@ -0,0 +1,11 @@ +name: debian bullseye gcc11flow + +on: [workflow_dispatch, workflow_call] + +jobs: + + bullseye-gcc11: + uses: ./.github/workflows/task-unit-test.yml + with: + container: gcc:11-bullseye + pre-checkout-script: apt-get update && apt-get -y install git diff --git a/.github/workflows/debian11.yml b/.github/workflows/debian11.yml index ad3c5f84b..d06e417a8 100644 --- a/.github/workflows/debian11.yml +++ b/.github/workflows/debian11.yml @@ -8,9 +8,3 @@ jobs: with: container: debian:bullseye pre-checkout-script: apt-get update && apt-get -y install git - - bullseye-gcc11: - uses: ./.github/workflows/task-unit-test.yml - with: - container: gcc:11-bullseye - pre-checkout-script: apt-get update && apt-get -y install git diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml index ef9723d2d..f92b16de4 100644 --- a/.github/workflows/event-nightly.yml +++ b/.github/workflows/event-nightly.yml @@ -28,6 +28,8 @@ jobs: # needs: [check-if-docs-only] # if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }} # uses: ./.github/workflows/amazon2.yml + bullseye-gcc11: + uses: ./.github/workflows/debian-bullseye-gcc11.yml mariner2: uses: ./.github/workflows/mariner2.yml rocky8: From 9c6e14e768d212473d07425214b237e520ad1407 Mon Sep 17 00:00:00 2001 From: BenGoldberger Date: Mon, 26 May 2025 17:04:34 +0300 Subject: [PATCH 5/7] check workflow --- .github/workflows/debian11.yml | 6 ++++++ .github/workflows/event-nightly.yml | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debian11.yml b/.github/workflows/debian11.yml index d06e417a8..ad3c5f84b 100644 --- a/.github/workflows/debian11.yml +++ b/.github/workflows/debian11.yml @@ -8,3 +8,9 @@ jobs: with: container: debian:bullseye pre-checkout-script: apt-get update && apt-get -y install git + + bullseye-gcc11: + uses: ./.github/workflows/task-unit-test.yml + with: + container: gcc:11-bullseye + pre-checkout-script: apt-get update && apt-get -y install git diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml index f92b16de4..ef9723d2d 100644 --- a/.github/workflows/event-nightly.yml +++ b/.github/workflows/event-nightly.yml @@ -28,8 +28,6 @@ jobs: # needs: [check-if-docs-only] # if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }} # uses: ./.github/workflows/amazon2.yml - bullseye-gcc11: - uses: ./.github/workflows/debian-bullseye-gcc11.yml mariner2: uses: ./.github/workflows/mariner2.yml rocky8: From 33f80806d4e771cf9e974a0ceed04ea0edc767cc Mon Sep 17 00:00:00 2001 From: BenGoldberger Date: Mon, 26 May 2025 17:14:45 +0300 Subject: [PATCH 6/7] add gcc11 option --- .github/workflows/debian-bullseye-gcc11.yml | 11 ----------- .github/workflows/debian11.yml | 18 +++++++++++++++++- .github/workflows/event-merge-to-queue.yml | 2 ++ .github/workflows/event-nightly.yml | 2 ++ 4 files changed, 21 insertions(+), 12 deletions(-) delete mode 100644 .github/workflows/debian-bullseye-gcc11.yml diff --git a/.github/workflows/debian-bullseye-gcc11.yml b/.github/workflows/debian-bullseye-gcc11.yml deleted file mode 100644 index f9ef2e1bb..000000000 --- a/.github/workflows/debian-bullseye-gcc11.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: debian bullseye gcc11flow - -on: [workflow_dispatch, workflow_call] - -jobs: - - bullseye-gcc11: - uses: ./.github/workflows/task-unit-test.yml - with: - container: gcc:11-bullseye - pre-checkout-script: apt-get update && apt-get -y install git diff --git a/.github/workflows/debian11.yml b/.github/workflows/debian11.yml index ad3c5f84b..c6c2476d1 100644 --- a/.github/workflows/debian11.yml +++ b/.github/workflows/debian11.yml @@ -1,6 +1,20 @@ name: debian bullseye flow -on: [workflow_dispatch, workflow_call] +on: + workflow_dispatch: + inputs: + gcc11: + description: 'Use GCC 11' + required: false + default: false + type: boolean + workflow_call: + inputs: + gcc11: + description: 'Use GCC 11' + required: false + default: false + type: boolean jobs: bullseye: @@ -10,7 +24,9 @@ jobs: pre-checkout-script: apt-get update && apt-get -y install git bullseye-gcc11: + if: ${{ inputs.gcc11 == true }} uses: ./.github/workflows/task-unit-test.yml with: container: gcc:11-bullseye pre-checkout-script: apt-get update && apt-get -y install git + diff --git a/.github/workflows/event-merge-to-queue.yml b/.github/workflows/event-merge-to-queue.yml index 3a8e53b3f..99381c6d6 100644 --- a/.github/workflows/event-merge-to-queue.yml +++ b/.github/workflows/event-merge-to-queue.yml @@ -21,6 +21,8 @@ jobs: # container: ubuntu:bionic bullseye: uses: ./.github/workflows/debian11.yml + with: + gcc11: false # amazonlinux2: # needs: [check-if-docs-only] # if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }} diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml index ef9723d2d..3128c34a0 100644 --- a/.github/workflows/event-nightly.yml +++ b/.github/workflows/event-nightly.yml @@ -24,6 +24,8 @@ jobs: # container: ubuntu:bionic bullseye: uses: ./.github/workflows/debian11.yml + with: + gcc11: true # amazonlinux2: # needs: [check-if-docs-only] # if: ${{ needs.check-if-docs-only.outputs.only-docs-changed == 'false' }} From 3d8823f00c20f3a3bc56ed361b269f92e4a303a5 Mon Sep 17 00:00:00 2001 From: BenGoldberger Date: Mon, 26 May 2025 17:18:10 +0300 Subject: [PATCH 7/7] fix nightly --- .github/workflows/event-nightly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml index 3128c34a0..2ee33aa02 100644 --- a/.github/workflows/event-nightly.yml +++ b/.github/workflows/event-nightly.yml @@ -51,7 +51,6 @@ jobs: - focal # - bionic - bullseye - - bullseye-gcc11 # - amazonlinux2 - mariner2 - rocky8