From 48aec027de2cad45515e107a3cce0f5c95dcad73 Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Tue, 18 Jun 2024 19:03:43 -0700 Subject: [PATCH 1/4] invert conditional --- conda_smithy/configure_feedstock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py index b0f46cd92..a025148e4 100644 --- a/conda_smithy/configure_feedstock.py +++ b/conda_smithy/configure_feedstock.py @@ -1658,7 +1658,7 @@ def _github_actions_specific_setup( labels_default = ( ["hosted"] - if forge_config["github_actions"]["self_hosted"] + if not forge_config["github_actions"]["self_hosted"] else ["self-hosted"] ) labels = conda_build.utils.ensure_list( From 36139faf84b22513ab2a4016f4604a5d3ec7ac1f Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 20 Jun 2024 14:53:15 -0700 Subject: [PATCH 2/4] make condition more readable --- conda_smithy/configure_feedstock.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conda_smithy/configure_feedstock.py b/conda_smithy/configure_feedstock.py index a025148e4..34a307faf 100644 --- a/conda_smithy/configure_feedstock.py +++ b/conda_smithy/configure_feedstock.py @@ -1657,9 +1657,9 @@ def _github_actions_specific_setup( hosted_default = list(runs_on[data["build_platform"]]["hosted_labels"]) labels_default = ( - ["hosted"] - if not forge_config["github_actions"]["self_hosted"] - else ["self-hosted"] + ["self-hosted"] + if forge_config["github_actions"]["self_hosted"] + else ["hosted"] ) labels = conda_build.utils.ensure_list( data["config"].get("github_actions_labels", [labels_default])[0] From 48b0c4437881bce9cfcf630698ccecb66d345900 Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 20 Jun 2024 16:49:58 -0700 Subject: [PATCH 3/4] added news file --- news/1959-runs-on.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/1959-runs-on.rst diff --git a/news/1959-runs-on.rst b/news/1959-runs-on.rst new file mode 100644 index 000000000..a696de809 --- /dev/null +++ b/news/1959-runs-on.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* Bug causing rerender to incorrectly set the runs-on github actions option in the workflow yaml when self_hosted is set to true + +**Security:** + +* From 6c391d7ccbfcad2d45b4970d6322d89f1b12de92 Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 20 Jun 2024 16:50:21 -0700 Subject: [PATCH 4/4] Rename 1959-runs-on.rst to 1959_runs_on.rst --- news/{1959-runs-on.rst => 1959_runs_on.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{1959-runs-on.rst => 1959_runs_on.rst} (100%) diff --git a/news/1959-runs-on.rst b/news/1959_runs_on.rst similarity index 100% rename from news/1959-runs-on.rst rename to news/1959_runs_on.rst