diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff24e3900..89247cbba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,8 +29,8 @@ on: cylc_rose_repo: description: The cylc-rose repo to test against required: false - schedule: - - cron: '37 04 * * 1-5' # 03:37, Monday-Friday + # schedule: + # - cron: '37 04 * * 1-5' # 04:37, Monday-Friday defaults: run: @@ -82,9 +82,11 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-22.04'] - python-version: ['3.7', '3.8', '3.9'] + os: ['ubuntu-latest'] + python-version: ['3.8', '3.9', '3.x'] include: + - os: ubuntu-22.04 + python-version: '3.7' - os: 'macos-latest' python-version: '3.8' diff --git a/t/rose-metadata-check/09-custom-macro.t b/t/rose-metadata-check/09-custom-macro.t index 417bb1a72..4be25d8fc 100755 --- a/t/rose-metadata-check/09-custom-macro.t +++ b/t/rose-metadata-check/09-custom-macro.t @@ -19,9 +19,9 @@ #------------------------------------------------------------------------------- # Test "rose metadata-check". #------------------------------------------------------------------------------- -. $(dirname $0)/test_header +. "$(dirname "$0")/test_header" #------------------------------------------------------------------------------- -tests 18 +tests 20 #------------------------------------------------------------------------------- # Check macro reference checking. TEST_KEY=$TEST_KEY_BASE-import-simple-ok @@ -30,7 +30,7 @@ init <<__META_CONFIG__ [namelist:macro_nl=my_macro_var1] macro=envswitch.LogicalTransformer __META_CONFIG__ -init_macro envswitch.py < $TEST_SOURCE_DIR/lib/custom_macro.py +init_macro envswitch.py < "${TEST_SOURCE_DIR}/lib/custom_macro.py" run_pass "$TEST_KEY" rose metadata-check -C ../config file_cmp "$TEST_KEY.out" "$TEST_KEY.out"