Skip to content

Commit

Permalink
Fix issue with tox 4.9 (#100)
Browse files Browse the repository at this point in the history
  • Loading branch information
WilliamJamieson authored Aug 22, 2023
2 parents 6f84b52 + 20313ac commit e84c2c2
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 9 deletions.
25 changes: 17 additions & 8 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
name: Ensure changelog
name: Changelog

on:
pull_request:
types: [labeled, unlabeled, opened, synchronize, reopened]

# Only cancel in-progress jobs or runs for the current workflow
# This cancels the already triggered workflows for a specific PR without canceling
# other instances of this workflow (other PRs, scheduled triggers, etc) when something
# within that PR re-triggers this CI
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
ensure_changelog:
name: Verify that a changelog entry exists for this pull request
changelog:
name: Confirm changelog entry
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- run: grep -P '\[[^\]]*#${{github.event.number}}[,\]]' CHANGES.rst
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changelog-entry-needed') }}
- name: Check change log entry
uses: scientific-python/action-check-changelogfile@6087eddce1d684b0132be651a4dad97699513113 # 0.2
env:
CHANGELOG_FILENAME: CHANGES.rst
CHECK_MILESTONE: false
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
# Weekly Monday 9AM build
# * is a special character in YAML so you have to quote this string
- cron: '0 9 * * 1'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/ci_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,20 @@ on:
schedule:
# Weekly Monday 6AM build
- cron: "0 0 * * 1"
pull_request:
# We also want this workflow triggered if the `Weekly CI` label is
# added or present when PR is updated
types:
- synchronize
- labeled
push:
tags: "*"
workflow_dispatch:

jobs:
test:
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
if: (github.repository == 'spacetelescope/stpipe' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'Weekly CI')))
with:
envs: |
- macos: test-xdist
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
check-{style,security,build}
test{,-warnings,-cov}-xdist
test{,-warnings,-cov,-xdist,-oldestdeps,-devdeps}
test-numpy{120,121,122}
test-{jwst,romancal}-xdist
build-{docs,dist}
Expand Down

0 comments on commit e84c2c2

Please sign in to comment.