Skip to content

Commit

Permalink
Merge pull request #6277 from MetRonnie/actions-macos
Browse files Browse the repository at this point in the history
Skip some failing functional tests on MacOS GH Actions runner
  • Loading branch information
oliver-sanders authored Aug 6, 2024
2 parents 9220919 + 99baebb commit 0eab427
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tests/functional/flow-triggers/11-wait-merge.t
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# THIS FILE IS PART OF THE CYLC WORKFLOW ENGINE.
# Copyright (C) NIWA & British Crown (Met Office) & Contributors.
#
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
Expand All @@ -17,6 +17,7 @@
#-------------------------------------------------------------------------------

. "$(dirname "$0")/test_header"
skip_macos_gh_actions
set_test_number 4

install_and_validate "${TEST_NAME_BASE}" "${TEST_NAME_BASE}" true
Expand Down
7 changes: 7 additions & 0 deletions tests/functional/lib/bash/test_header
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,13 @@ skip_all() {
exit
}

skip_macos_gh_actions() {
# https://github.com/cylc/cylc-flow/issues/6276
if [[ "$CI" && "$OSTYPE" == "darwin"* ]]; then
skip_all "Skipped due to performance issues on GH Actions MacOS runner"
fi
}

ssh_install_cylc() {
local RHOST="$1"
local RHOST_CYLC_DIR=
Expand Down
1 change: 1 addition & 0 deletions tests/functional/modes/04-simulation-runtime.t
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
# Test that we can broadcast an alteration to simulation mode.

. "$(dirname "$0")/test_header"
skip_macos_gh_actions
set_test_number 7

install_workflow "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
Expand Down

0 comments on commit 0eab427

Please sign in to comment.