Skip to content

Commit bbf533f

Browse files
committed
revert changes in workflows. add note about usage of check action
1 parent 52c47f0 commit bbf533f

File tree

2 files changed

+25
-29
lines changed

2 files changed

+25
-29
lines changed

.github/py-shiny/check/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'check py-shiny'
2-
description: 'Action that checks py-shiny in multiple steps so that any of them may fail but not prevent the others from running'
2+
description: 'Action that checks py-shiny in multiple steps so that any of them may fail but not prevent the others from running. Note, this action is used by py-htmltools as a way to consistently check py-shiny. If more checks are needed for py-htmltools to believe py-shiny is working, it should be added here.'
33
runs:
44
using: "composite"
55
steps:

.github/workflows/pytest.yaml

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Run tests
33
on:
44
workflow_dispatch:
55
push:
6-
branches: ["main", "rc-*", "htmltools_type_changes"]
6+
branches: ["main", "rc-*"]
77
pull_request:
88
types: [opened, synchronize, reopened, ready_for_review]
99
release:
@@ -38,34 +38,30 @@ jobs:
3838
with:
3939
python-version: ${{ matrix.python-version }}
4040

41-
- name: Check
41+
- name: Run unit tests
4242
if: steps.install.outcome == 'success' && (success() || failure())
43-
uses: ./.github/py-shiny/check
44-
45-
# - name: Run unit tests
46-
# if: steps.install.outcome == 'success' && (success() || failure())
47-
# run: |
48-
# make check-tests
49-
50-
# - name: Type check
51-
# if: steps.install.outcome == 'success' && (success() || failure())
52-
# run: |
53-
# make check-types
54-
55-
# - name: Lint code
56-
# if: steps.install.outcome == 'success' && (success() || failure())
57-
# run: |
58-
# make check-lint
59-
60-
# - name: Verify code formatting
61-
# if: steps.install.outcome == 'success' && (success() || failure())
62-
# run: |
63-
# make check-format
64-
65-
# - name: Verify code can run with mypy (not Windows)
66-
# if: steps.install.outcome == 'success' && (success() || failure()) && matrix.os != 'windows-latest'
67-
# run: |
68-
# make ci-check-mypy-can-run
43+
run: |
44+
make check-tests
45+
46+
- name: Type check
47+
if: steps.install.outcome == 'success' && (success() || failure())
48+
run: |
49+
make check-types
50+
51+
- name: Lint code
52+
if: steps.install.outcome == 'success' && (success() || failure())
53+
run: |
54+
make check-lint
55+
56+
- name: Verify code formatting
57+
if: steps.install.outcome == 'success' && (success() || failure())
58+
run: |
59+
make check-format
60+
61+
- name: Verify code can run with mypy (not Windows)
62+
if: steps.install.outcome == 'success' && (success() || failure()) && matrix.os != 'windows-latest'
63+
run: |
64+
make ci-check-mypy-can-run
6965
7066
pypi:
7167
name: "Deploy to PyPI"

0 commit comments

Comments
 (0)