Skip to content

Commit c772615

Browse files
MetRonnieMetRonnie
committed
Merge 'upstream/master' into 8.5.x-sync
2 parents 07a2398 + d7243dd commit c772615

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1667
-1459
lines changed

‎.github/workflows/1_create_release_pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: cylc/release-actions/stage-1/sanitize-inputs@v1
3535

3636
- name: Checkout repo
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v5
3838
with:
3939
ref: ${{ env.BASE_REF }}
4040
fetch-depth: 0 # need to fetch all commits to check contributors
@@ -43,7 +43,7 @@ jobs:
4343
uses: cylc/release-actions/check-shortlog@v1
4444

4545
- name: Setup Python
46-
uses: actions/setup-python@v5
46+
uses: actions/setup-python@v6
4747
with:
4848
python-version: '3.x'
4949

‎.github/workflows/2_auto_publish_release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333
steps:
3434

3535
- name: Checkout repo
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
with:
3838
ref: ${{ env.MERGE_SHA }}
3939

4040
- name: Setup Python
41-
uses: actions/setup-python@v5
41+
uses: actions/setup-python@v6
4242
with:
4343
python-version: '3.x'
4444

‎.github/workflows/bash.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,21 @@ jobs:
5151
- '4.2'
5252
# if you use a value like 5.0, YAML will round it to 5, which will cause an error later on
5353
- '5.0'
54+
env:
55+
IMAGE: 'ghcr.io/cylc/cylc-bash-testing-2:master'
5456
steps:
5557
- name: Checkout
56-
uses: actions/checkout@v4
58+
uses: actions/checkout@v5
5759

5860
- name: Run Docker container
5961
run: |
60-
docker pull ghcr.io/cylc/cylc-bash-testing:master
61-
docker run --name bash -v $(pwd -P):/root/cylc-flow --rm -t -d -m 1G --memory-swap 1G ghcr.io/cylc/cylc-bash-testing:master /bin/bash
62+
docker pull "$IMAGE"
63+
docker run --name bash -v $(pwd -P):/root/cylc-flow --rm -t -d -m 1G --memory-swap 1G "$IMAGE" /bin/bash
6264
docker ps -a
6365
6466
- name: Install Cylc dependencies in the container
6567
run: |
66-
docker exec bash python3.7 -m pip install six==1.12
67-
docker exec -w /root/cylc-flow bash python3.7 -m pip install .[all]
68+
docker exec -w /root/cylc-flow bash python3.12 -m pip install .[all] --break-system-packages
6869
6970
- name: Set the container bash version
7071
run: docker exec bash update-alternatives --set bash /bash/bash-${{ matrix.bash-version }}

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,10 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
os: ['ubuntu-latest', 'macos-latest']
36-
python: ['3.7', '3.8', '3.9', '3.10', '3']
37-
exclude:
38-
- os: 'macos-latest'
39-
python: '3.7'
36+
python: ['3.12', '3']
4037
steps:
4138
- name: Checkout
42-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4340

4441
- name: Setup Python
4542
uses: mamba-org/setup-micromamba@v2

‎.github/workflows/shortlog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
timeout-minutes: 10
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
fetch-depth: 0 # need to fetch all commits to check contributors
2222
ref: ${{ github.event.pull_request.head.sha }}

‎.github/workflows/test_conda-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
python-version: ['3.8', '3']
31+
python-version: ['3.12', '3']
3232
env:
3333
ENV_FILE: conda-environment.yml
3434
steps:
3535
- name: checkout cylc-flow
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737

3838
- name: modify conda env file
3939
run: |

‎.github/workflows/test_fast.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ jobs:
2727
fail-fast: false # don't stop on first failure
2828
matrix:
2929
os: ['ubuntu-latest']
30-
python-version: ['3.7', '3.8', '3.10', '3.11', '3.12', '3']
30+
python-version: ['3.12', '3']
3131
include:
3232
- os: 'macos-latest'
33-
python-version: '3.8' # oldest version with arm64 builds
33+
python-version: '3.12' # oldest version we support
3434
# non-utc timezone test
3535
- os: 'ubuntu-latest'
36-
python-version: '3.9' # not the oldest, not the most recent version
36+
python-version: '3'
3737
time-zone: 'XXX-09:35'
3838
env:
3939
TZ: ${{ matrix.time-zone }}
4040
PYTEST_ADDOPTS: --cov --cov-append -n 5 --color=yes
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v5
4444

4545
- name: Install System Dependencies
4646
uses: mamba-org/setup-micromamba@v2
@@ -111,7 +111,7 @@ jobs:
111111
FORCE_COLOR: 2
112112
steps:
113113
- name: Checkout
114-
uses: actions/checkout@v4
114+
uses: actions/checkout@v5
115115

116116
- name: Install System Dependencies
117117
uses: mamba-org/setup-micromamba@v2
@@ -154,10 +154,10 @@ jobs:
154154
timeout-minutes: 2
155155
steps:
156156
- name: Checkout
157-
uses: actions/checkout@v4
157+
uses: actions/checkout@v5
158158

159159
- name: Download coverage artifacts
160-
uses: actions/download-artifact@v4
160+
uses: actions/download-artifact@v5
161161

162162
- name: Codecov upload
163163
uses: codecov/codecov-action@v5

‎.github/workflows/test_functional.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
fail-fast: false
5050
matrix:
5151
os: ['ubuntu-22.04']
52-
python-version: ['3.7']
52+
python-version: ['3.12'] # oldest version we support
5353
test-base: ['tests/f']
5454
chunk: ['1/4', '2/4', '3/4', '4/4']
5555
platform: ['_local_background* _local_at*']
@@ -65,27 +65,27 @@ jobs:
6565
# tests/k
6666
- name: 'flaky'
6767
os: 'ubuntu-latest'
68-
python-version: '3.7'
68+
python-version: '3.12'
6969
test-base: 'tests/k'
7070
chunk: '1/1'
7171
platform: '_local_background* _local_at*'
7272
# remote platforms
7373
- name: '_remote_background_indep_poll'
7474
os: 'ubuntu-latest'
75-
python-version: '3.7'
75+
python-version: '3.12'
7676
test-base: 'tests/f tests/k'
7777
chunk: '1/1'
7878
platform: '_remote_background_indep_poll _remote_at_indep_poll'
7979
- name: '_remote_background_indep_tcp'
8080
os: 'ubuntu-latest'
8181
test-base: 'tests/f tests/k'
82-
python-version: '3.7'
82+
python-version: '3.12'
8383
chunk: '1/1'
8484
platform: '_remote_background_indep_tcp _remote_at_indep_tcp'
8585
# macos
8686
- name: 'macos 1/5'
8787
os: 'macos-latest'
88-
python-version: '3.8' # oldest available
88+
python-version: '3.12' # oldest version we support
8989
test-base: 'tests/f'
9090
chunk: '1/5'
9191
platform: '_local_background*'
@@ -106,7 +106,7 @@ jobs:
106106

107107
steps:
108108
- name: Checkout
109-
uses: actions/checkout@v4
109+
uses: actions/checkout@v5
110110

111111
- name: Configure Python
112112
uses: mamba-org/setup-micromamba@v2
@@ -326,10 +326,10 @@ jobs:
326326
timeout-minutes: 2
327327
steps:
328328
- name: Checkout
329-
uses: actions/checkout@v4
329+
uses: actions/checkout@v5
330330

331331
- name: Download coverage artifacts
332-
uses: actions/download-artifact@v4
332+
uses: actions/download-artifact@v5
333333

334334
- name: Codecov upload
335335
uses: codecov/codecov-action@v5

‎.github/workflows/test_tutorial_workflow.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ jobs:
3434
- os: 'ubuntu-latest'
3535
python-version: '3'
3636
- os: 'ubuntu-22.04'
37-
python-version: '3.7'
37+
python-version: '3.12'
3838
runs-on: ${{ matrix.os }}
3939
timeout-minutes: 10
4040
steps:
4141
- name: configure python
42-
uses: actions/setup-python@v5
42+
uses: actions/setup-python@v6
4343
with:
4444
python-version: ${{ matrix.python-version }}
4545

4646
- name: checkout
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848

4949
- name: Install docs/tutorial dependencies
5050
uses: cylc/cylc-doc/.github/actions/install-dependencies@master

‎.github/workflows/update_copyright.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313

1414
- name: Checkout repo
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Configure git
1818
uses: cylc/release-actions/configure-git@v1

0 commit comments

Comments
 (0)