Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix shellcheck error SC2317 & failing test #2845

Merged
merged 5 commits into from
Jan 8, 2025
Merged

Fix shellcheck error SC2317 & failing test #2845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
662223a
excluded shellcheck error SC2317
wxtim Jan 8, 2025
12e603c
change ubuntu version
wxtim Jan 8, 2025
d4442fd
remove shellcheck failure at cause, not by ignorance
wxtim Jan 8, 2025
6c31f08
fix test
wxtim Jan 8, 2025
ddc8014
another shellcheck fix
wxtim Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ['ubuntu-latest']
os: ['ubuntu-22.04']
python-version: ['3.7', '3.8', '3.9']
include:
- os: 'macos-latest'
Expand Down
4 changes: 2 additions & 2 deletions metomi/rose/scripts/rose-mpi-launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ while (($# > 0)); do
--help)
rose_help
exit
:;;
;;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotta do this for the other branches too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I had no idea : was an alias for true)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only the other branch with an exit in it.

--command-file=*)
ROSE_COMMAND_FILE=${1#*=}
shift 1
Expand All @@ -153,7 +153,7 @@ while (($# > 0)); do
case "$OPT" in
'?')
err "ROSE_LAUNCHER_ULIMIT_OPTS=$ROSE_LAUNCHER_ULIMIT_OPTS"
:;;
;;
*)
ulimit -$OPT ${OPTARG:-} || err \
"ROSE_LAUNCHER_ULIMIT_OPTS=$ROSE_LAUNCHER_ULIMIT_OPTS"
Expand Down
2 changes: 1 addition & 1 deletion t/rose-task-run/06-app-prune-iso/flow.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% if HOST != 'localhost' %}
my_task_2
{% endif %}
WARM[-PT12H]:finish-all => rose_prune
WARM[-PT12H]:succeed-all => rose_prune
"""

[runtime]
Expand Down
Loading