Skip to content

Commit

Permalink
Merge pull request #5382 from MetRonnie/8.1.x-deconflict
Browse files Browse the repository at this point in the history
8.1.x -> master
  • Loading branch information
oliver-sanders authored Feb 27, 2023
2 parents c7fb807 + c4dd339 commit 62fdc6e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/2_auto_publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- name: Publish GitHub release
id: create-release
uses: actions/create-release@v1
uses: cylc/release-actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ updated. Only the first match gets replaced, so it's fine to leave the old
ones in. -->

-------------------------------------------------------------------------------
## __cylc-8.1.2 (<span actions:bind='release-date'>Coming Soon</span>)__
## __cylc-8.1.2 (<span actions:bind='release-date'>Released 2023-02-20</span>)__

### Fixes

Expand Down
16 changes: 10 additions & 6 deletions cylc/flow/scripts/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,16 @@ async def scan(wf_name: str, ping: bool = True) -> None:
'source': False,
'ping': ping, # get status of scanned workflows
})
active = [
item async for item in get_pipe(
opts, None,
scan_dir=get_workflow_run_dir(wf_name) # restricted scan
)
]
active = sorted(
[
item async for item in get_pipe(
opts,
None,
scan_dir=get_workflow_run_dir(wf_name) # restricted scan
)
],
key=lambda flow: flow['name']
)
if active:
n = len(active)
grammar = (
Expand Down

0 comments on commit 62fdc6e

Please sign in to comment.