Macos 13

.github/workflows/1_create_release_pr.yml

@@ -21,7 +21,7 @@ jobs:
         uses: cylc/release-actions/stage-1/sanitize-inputs@v1
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.BASE_REF }}
           fetch-depth: 0  # need to fetch all commits to check contributors
@@ -30,7 +30,7 @@ jobs:
         uses: cylc/release-actions/check-shortlog@v1
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -43,15 +43,14 @@ jobs:
           init-file: 'cylc/flow/__init__.py'
           pypi-package-name: 'cylc-flow'
 
-      - name: Update "released on" date in changelog
-        continue-on-error: true
-        uses: cylc/release-actions/stage-1/update-changelog-release-date@v1
-        with:
-          changelog-file: 'CHANGES.md'
-
       - name: Test build
         uses: cylc/release-actions/build-python-package@v1
 
+      - name: Generate changelog
+        run: |
+          python3 -m pip install -q towncrier
+          towncrier build --yes
+
       - name: Create pull request
         uses: cylc/release-actions/stage-1/create-release-pr@v1
         with:

.github/workflows/2_auto_publish_release.yml

@@ -22,12 +22,12 @@ jobs:
     steps:
 
     - name: Checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ env.MERGE_SHA }}
 
     - name: Setup Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
 
@@ -38,7 +38,7 @@ jobs:
       uses: cylc/release-actions/build-python-package@v1
 
     - name: Publish distribution to PyPI
-      uses: pypa/[email protected].7
+      uses: pypa/[email protected].11
       with:
         user: __token__ # uses the API token feature of PyPI - least permissions possible
         password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/bash.yml

@@ -44,7 +44,7 @@ jobs:
           - '5.0'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run Docker container
         run: |
@@ -85,7 +85,7 @@ jobs:
 
       - name: Upload artifact
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: Upload cylc-run artifact
+          name: 'cylc-run (bash-${{ matrix.bash-version }})'
           path: cylc-run

.github/workflows/branch_sync.yml

@@ -4,117 +4,17 @@ on:
   push:
     branches:
       - '8.*.x'
+  schedule:
+    - cron: '33 04 * * 1-5' # 04:33 UTC Mon-Fri
   workflow_dispatch:
     inputs:
-      branch:
+      head_branch:
         description: Branch to merge into master
         required: true
 
 jobs:
   sync:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    env:
-      BRANCH: ${{ inputs.branch || github.ref_name }}
-    steps:
-      - name: Check branch name
-        shell: python
-        run: |
-          import os
-          import sys
-
-          branch = os.environ['BRANCH'].strip()
-          if not branch:
-            sys.exit("::error::Branch name cannot be empty")
-          if branch.endswith('deconflict'):
-            sys.exit("::error::Do not run this workflow for already-created deconflict branches")
-
-          with open(os.environ['GITHUB_ENV'], 'a') as F:
-            print(f'BRANCH={branch}', file=F)
-            print(f'DECONFLICT_BRANCH={branch}-deconflict', file=F)
-
-      - name: Check for existing PR
-        id: check-pr
-        shell: python
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          import os
-          import json
-          import subprocess
-          import sys
-
-          for env_var in ('BRANCH', 'DECONFLICT_BRANCH'):
-            branch = os.environ[env_var]
-            cmd = f'gh pr list -B master -H {branch} -s open --json url -R ${{ github.repository }}'
-            ret = subprocess.run(
-              cmd, shell=True, capture_output=True, text=True
-            )
-            print(ret.stdout)
-            if ret.stderr:
-              print(f"::error::{ret.stderr}")
-            if ret.returncode:
-              sys.exit(ret.returncode)
-            if json.loads(ret.stdout):
-              print(f"::notice::Found existing PR for {branch}")
-              sys.exit(0)
-
-          print("No open PRs found")
-          with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
-            print('continue=true', file=f)
-
-      - name: Checkout
-        if: steps.check-pr.outputs.continue
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: master
-
-      - name: Configure git
-        if: steps.check-pr.outputs.continue
-        uses: cylc/release-actions/configure-git@v1
-
-      - name: Attempt merge
-        id: merge
-        if: steps.check-pr.outputs.continue
-        continue-on-error: true
-        run: git merge "origin/${BRANCH}"
-
-      - name: Diff
-        id: diff
-        if: steps.merge.outcome == 'success'
-        run: |
-          if [[ "$(git rev-parse HEAD)" == "$(git rev-parse origin/master)" ]]; then
-            echo "::notice::master is up to date with $BRANCH"
-            exit 0
-          fi
-          if git diff HEAD^ --exit-code --stat; then
-            echo "::notice::No diff between master and $BRANCH"
-            exit 0
-          fi
-          echo "continue=true" >> $GITHUB_OUTPUT
-
-      - name: Create deconflict branch
-        if: steps.merge.outcome == 'failure'
-        run: |
-          git merge --abort
-          git checkout -b "$DECONFLICT_BRANCH" "origin/${BRANCH}"
-          git push origin "$DECONFLICT_BRANCH"
-          echo "BRANCH=${DECONFLICT_BRANCH}" >> $GITHUB_ENV
-
-      - name: Open PR
-        if: steps.merge.outcome == 'failure' || steps.diff.outputs.continue
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BODY: |
-            Please do a **normal merge**, not squash merge
-
-            ---
-
-            Triggered by `${{ github.event_name }}`
-        run: |
-          gh pr create --head "$BRANCH" \
-            --title "🤖 Merge ${BRANCH} into master" \
-            --body "$BODY"
-
-          gh pr edit "$BRANCH" --add-label "sync" || true
+    uses: cylc/release-actions/.github/workflows/branch-sync.yml@v1
+    with:
+      head_branch: ${{ inputs.head_branch }}
+    secrets: inherit

.github/workflows/build.yml

@@ -24,10 +24,10 @@ jobs:
             python: '3.7'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 

.github/workflows/shortlog.yml

@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0  # need to fetch all commits to check contributors
 

.github/workflows/test_conda-build.yml

@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: checkout cylc-flow
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: build conda env
         run: |

.github/workflows/test_fast.yml

@@ -17,29 +17,39 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     strategy:
-      fail-fast: false # Don't let a failed MacOS run stop the Ubuntu runs
+      fail-fast: false # don't stop on first failure
       matrix:
         os: ['ubuntu-latest']
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.10', '3.11', '3']
         include:
-          - os: 'macos-latest'
-            python-version: '3.7'
+          # mac os test
+          - os: 'macos-13'
+            python-version: '3.7'  # oldest supported version
+
+          # non-utc timezone test
+          - os: 'ubuntu-latest'
+            python-version: '3.9'  # not the oldest, not the most recent version
+            time-zone: 'XXX-09:35'
+
     env:
+      # Use non-UTC time zone
+      TZ: ${{ matrix.time-zone }}
       PYTEST_ADDOPTS: --cov --cov-append -n 5 --color=yes
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Apt-Get Install
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           sudo apt-get update
-          sudo apt-get install -y shellcheck sqlite3
+          sudo apt-get install -y sqlite3
 
       - name: Install
         run: |
@@ -48,31 +58,10 @@ jobs:
       - name: Configure git  # Needed by the odd test
         uses: cylc/release-actions/configure-git@v1
 
-      - name: Style
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          flake8
-          etc/bin/shellchecker
-
-      - name: Typing
-        if: startsWith(matrix.os, 'ubuntu')
-        run: mypy
-
-      - name: Doctests
-        timeout-minutes: 4
-        run: |
-          pytest cylc/flow
-
       - name: Unit Tests
-        timeout-minutes: 4
+        timeout-minutes: 5
         run: |
-          pytest tests/unit
-
-      - name: Bandit
-        if: ${{ matrix.python-version == '3.7' }}
-        # https://github.com/PyCQA/bandit/issues/658
-        run: |
-          bandit -r --ini .bandit cylc/flow
+          pytest cylc/flow tests/unit
 
       - name: Integration Tests
         timeout-minutes: 6
@@ -81,7 +70,7 @@ jobs:
 
       - name: Upload failed tests artifact
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cylc-run (${{ matrix.os }} py-${{ matrix.python-version }})
           path: ~/cylc-run/
@@ -92,26 +81,64 @@ jobs:
           coverage report
 
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage_${{ matrix.os }}_py-${{ matrix.python-version }}
           path: coverage.xml
           retention-days: 7
 
+  lint:
+    runs-on: 'ubuntu-latest'
+    timeout-minutes: 10
+    steps:
+      - name: Apt-Get Install
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y shellcheck
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # note: exclude python 3.10+ from mypy checks as these produce false
+      # positives in installed libraries for python 3.7
+      - name: Configure Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+
+      - name: Install
+        run: |
+          pip install -e ."[tests]"
+
+      - name: Flake8
+        run: flake8
+
+      - name: Bandit
+        run: |
+          bandit -r --ini .bandit cylc/flow
+
+      - name: Shellchecker
+        run: etc/bin/shellchecker
+
+      - name: MyPy
+        run: mypy
+
+      - name: Towncrier
+        run: towncrier build --draft
+
       - name: Linkcheck
-        if: startsWith(matrix.python-version, '3.10')
-        run: pytest -m linkcheck --dist=load tests/unit
+        run: pytest -m linkcheck --dist=load --color=yes -n 10 tests/unit/test_links.py
 
   codecov:
     needs: test
     runs-on: ubuntu-latest
     timeout-minutes: 2
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Codecov upload
         uses: codecov/codecov-action@v3