From f6f443a0dc19c08d602ea6f81f9abb86536834d3 Mon Sep 17 00:00:00 2001 From: Katerina Koukiou Date: Tue, 29 Oct 2024 08:14:43 +0100 Subject: [PATCH] infra: remove f41 from supported braches as it's past final date already --- .branch-variables.yml | 2 -- .github/workflows/container-autoupdate.yml | 2 +- .github/workflows/l10n-po-update.yml | 2 +- .github/workflows/tests-daily.yml | 10 ++-------- .github/workflows/try-release-daily.yml | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.branch-variables.yml b/.branch-variables.yml index e6c60383a5f..be125b26b4e 100644 --- a/.branch-variables.yml +++ b/.branch-variables.yml @@ -14,8 +14,6 @@ rawhide_fedora_version: 42 # number without quotation marks, or nothing if CI sh # List of all the branches which are currently supported and CI should be executed on these. supported_branches: - - fedora-41: - variant: "fedora" - rhel-9: variant: "rhel" - rhel-10: diff --git a/.github/workflows/container-autoupdate.yml b/.github/workflows/container-autoupdate.yml index 6f53e879057..fb0d76f1131 100644 --- a/.github/workflows/container-autoupdate.yml +++ b/.github/workflows/container-autoupdate.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ['master', 'fedora-41', 'rhel-9', 'rhel-10'] + branch: ['master', 'rhel-9', 'rhel-10'] # Don't run scheduled workflows on forks. if: github.event_name != 'schedule' || github.repository == 'rhinstaller/anaconda' uses: ./.github/workflows/container-rebuild-action.yml diff --git a/.github/workflows/l10n-po-update.yml b/.github/workflows/l10n-po-update.yml index b942b3bee08..85376457be5 100644 --- a/.github/workflows/l10n-po-update.yml +++ b/.github/workflows/l10n-po-update.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false max-parallel: 1 matrix: - branch: ['master', 'fedora-41', 'rhel-9', 'rhel-10'] + branch: ['master', 'rhel-9', 'rhel-10'] steps: - name: Set up dependencies diff --git a/.github/workflows/tests-daily.yml b/.github/workflows/tests-daily.yml index e95ee8b9139..9d9a7b829f9 100644 --- a/.github/workflows/tests-daily.yml +++ b/.github/workflows/tests-daily.yml @@ -42,7 +42,7 @@ jobs: strategy: fail-fast: false matrix: - release: ['master', 'fedora-41', 'rhel-9', 'rhel-10'] + release: ['master', 'rhel-9', 'rhel-10'] include: - release: 'master' target_branch: 'master' @@ -52,9 +52,6 @@ jobs: # target_branch: 'master' # ci_tag: 'eln' # build-args: '--build-arg=image=quay.io/fedoraci/fedora:eln-x86_64' - - release: 'fedora-41' - target_branch: 'fedora-41' - ci_tag: 'fedora-41' - release: 'rhel-9' target_branch: 'rhel-9' ci_tag: 'rhel-9' @@ -93,14 +90,11 @@ jobs: strategy: fail-fast: false matrix: - release: ['master', 'fedora-41', 'rhel-9', 'rhel-10'] + release: ['master', 'rhel-9', 'rhel-10'] include: - release: 'master' target_branch: 'master' ci_tag: 'master' - - release: 'fedora-41' - target_branch: 'fedora-41' - ci_tag: 'fedora-41' - release: 'rhel-9' target_branch: 'rhel-9' ci_tag: 'rhel-9' diff --git a/.github/workflows/try-release-daily.yml b/.github/workflows/try-release-daily.yml index 83b5ab895fb..ecdfa9a4d2a 100644 --- a/.github/workflows/try-release-daily.yml +++ b/.github/workflows/try-release-daily.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - branch: ['master', 'fedora-41', 'rhel-9', 'rhel-10'] + branch: ['master', 'rhel-9', 'rhel-10'] steps: - name: Check out repo