diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml index 647296eed6..934fbaca61 100644 --- a/.gitlab/ci/common.yml +++ b/.gitlab/ci/common.yml @@ -258,7 +258,6 @@ variables: tags: - macos-tart image: macos-sequoia-idf-v6.1 - cache: [] # cache are built for amd64 linux runners, useless here after_script: [] # ccache now is disabled for macos brew runners timeout: 30m diff --git a/tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml b/tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml index 18f41ddbf0..f986108c54 100644 --- a/tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml +++ b/tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml @@ -12,6 +12,7 @@ all_build_finished: expire_in: 1 week when: always before_script: [] + dependencies: [] script: - echo "all test jobs finished" diff --git a/tools/ci/utils.sh b/tools/ci/utils.sh index 5d5fef4202..a4c3a4875b 100644 --- a/tools/ci/utils.sh +++ b/tools/ci/utils.sh @@ -5,7 +5,14 @@ function add_ssh_keys() { mkdir -p ~/.ssh chmod 700 ~/.ssh echo -n "${key_string}" >~/.ssh/id_rsa_base64 - base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 >~/.ssh/id_rsa + # Detect base64 implementation via --help output + if base64 --help 2>&1 | grep -q -- '--ignore-garbage'; then + # GNU coreutils base64 + base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 >~/.ssh/id_rsa + else + # macOS/BSD base64 - requires stdin or -i flag + base64 --decode -i ~/.ssh/id_rsa_base64 -o ~/.ssh/id_rsa + fi chmod 600 ~/.ssh/id_rsa }