Skip to content

Commit d72c0fe

Browse files
VeckoTheGeckoVeckoTheGecko
committed
testing changes
REMOVE LATER: override detect-ci-trigger REVERT LATER: allow push to test-me branch REVERT LATER: override detect-ci-trigger
1 parent 1cef1b6 commit d72c0fe

4 files changed

Lines changed: 137 additions & 131 deletions

File tree

‎.github/workflows/ci-additional.yaml‎

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- "main"
6+
- "test-pixi-dust"
67
pull_request:
78
branches:
89
- "main"
@@ -20,11 +21,11 @@ jobs:
2021
detect-ci-trigger:
2122
name: detect ci trigger
2223
runs-on: ubuntu-latest
23-
if: |
24-
github.repository == 'pydata/xarray'
25-
&& (github.event_name == 'push' || github.event_name == 'pull_request')
24+
# if: |
25+
# github.repository == 'pydata/xarray'
26+
# && (github.event_name == 'push' || github.event_name == 'pull_request')
2627
outputs:
27-
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
28+
triggered: false
2829
steps:
2930
- uses: actions/checkout@v5
3031
with:
@@ -125,14 +126,14 @@ jobs:
125126
run: |
126127
pixi run -e ${{env.PIXI_ENV}} python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
127128
128-
- name: Upload mypy coverage to Codecov
129-
uses: codecov/codecov-action@v5.5.1
130-
with:
131-
file: mypy_report/cobertura.xml
132-
flags: mypy
133-
env_vars: PYTHON_VERSION
134-
name: codecov-umbrella
135-
fail_ci_if_error: false
129+
# - name: Upload mypy coverage to Codecov
130+
# uses: codecov/codecov-action@v5.5.1
131+
# with:
132+
# file: mypy_report/cobertura.xml
133+
# flags: mypy
134+
# # env_vars: PYTHON_VERSION
135+
# name: codecov-umbrella
136+
# fail_ci_if_error: false
136137

137138
mypy-min:
138139
name: Mypy 3.11
@@ -174,24 +175,24 @@ jobs:
174175
run: |
175176
pixi run -e ${{env.PIXI_ENV}} python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
176177
177-
- name: Upload mypy coverage to Codecov
178-
uses: codecov/codecov-action@v5.5.1
179-
with:
180-
file: mypy_report/cobertura.xml
181-
flags: mypy-min
182-
env_vars: PYTHON_VERSION
183-
name: codecov-umbrella
184-
fail_ci_if_error: false
178+
# - name: Upload mypy coverage to Codecov
179+
# uses: codecov/codecov-action@v5.5.1
180+
# with:
181+
# file: mypy_report/cobertura.xml
182+
# flags: mypy-min
183+
# # env_vars: PYTHON_VERSION
184+
# name: codecov-umbrella
185+
# fail_ci_if_error: false
185186

186187
pyright:
187188
name: Pyright
188189
runs-on: "ubuntu-latest"
189190
needs: [detect-ci-trigger, cache-pixi-lock]
190-
if: |
191-
always()
192-
&& (
193-
contains( github.event.pull_request.labels.*.name, 'run-pyright')
194-
)
191+
# if: |
192+
# always()
193+
# && (
194+
# contains( github.event.pull_request.labels.*.name, 'run-pyright')
195+
# )
195196
defaults:
196197
run:
197198
shell: bash -l {0}
@@ -229,24 +230,24 @@ jobs:
229230
run: |
230231
pixi run -e ${{env.PIXI_ENV}} python -m pyright xarray/
231232
232-
- name: Upload pyright coverage to Codecov
233-
uses: codecov/codecov-action@v5.5.1
234-
with:
235-
file: pyright_report/cobertura.xml
236-
flags: pyright
237-
env_vars: PYTHON_VERSION
238-
name: codecov-umbrella
239-
fail_ci_if_error: false
233+
# - name: Upload pyright coverage to Codecov
234+
# uses: codecov/codecov-action@v5.5.1
235+
# with:
236+
# file: pyright_report/cobertura.xml
237+
# flags: pyright
238+
# # env_vars: PYTHON_VERSION
239+
# name: codecov-umbrella
240+
# fail_ci_if_error: false
240241

241242
pyright39:
242243
name: Pyright 3.11
243244
runs-on: "ubuntu-latest"
244245
needs: [detect-ci-trigger, cache-pixi-lock]
245-
if: |
246-
always()
247-
&& (
248-
contains( github.event.pull_request.labels.*.name, 'run-pyright')
249-
)
246+
# if: |
247+
# always()
248+
# && (
249+
# contains( github.event.pull_request.labels.*.name, 'run-pyright')
250+
# )
250251
defaults:
251252
run:
252253
shell: bash -l {0}
@@ -283,14 +284,14 @@ jobs:
283284
run: |
284285
pixi run -e ${{env.PIXI_ENV}} python -m pyright xarray/
285286
286-
- name: Upload pyright coverage to Codecov
287-
uses: codecov/codecov-action@v5.5.1
288-
with:
289-
file: pyright_report/cobertura.xml
290-
flags: pyright39
291-
env_vars: PYTHON_VERSION
292-
name: codecov-umbrella
293-
fail_ci_if_error: false
287+
# - name: Upload pyright coverage to Codecov
288+
# uses: codecov/codecov-action@v5.5.1
289+
# with:
290+
# file: pyright_report/cobertura.xml
291+
# flags: pyright39
292+
# # env_vars: PYTHON_VERSION
293+
# name: codecov-umbrella
294+
# fail_ci_if_error: false
294295

295296
min-version-policy:
296297
name: Minimum Version Policy

‎.github/workflows/ci.yaml‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- "main"
6+
- "test-pixi-dust"
67
pull_request:
78
branches:
89
- "main"
@@ -20,19 +21,19 @@ jobs:
2021
detect-ci-trigger:
2122
name: detect ci trigger
2223
runs-on: ubuntu-latest
23-
if: |
24-
github.repository == 'pydata/xarray'
25-
&& (github.event_name == 'push' || github.event_name == 'pull_request')
24+
# if: |
25+
# github.repository == 'pydata/xarray'
26+
# && (github.event_name == 'push' || github.event_name == 'pull_request')
2627
outputs:
27-
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
28+
triggered: false
2829
steps:
2930
- uses: actions/checkout@v5
3031
with:
3132
fetch-depth: 2
32-
- uses: xarray-contrib/ci-trigger@v1
33-
id: detect-trigger
34-
with:
35-
keyword: "[skip-ci]"
33+
# - uses: xarray-contrib/ci-trigger@v1
34+
# id: detect-trigger
35+
# with:
36+
# keyword: "[skip-ci]"
3637

3738
cache-pixi-lock:
3839
uses: ./.github/workflows/cache-pixi-lock.yml
@@ -141,6 +142,8 @@ jobs:
141142
enableCrossOsArchive: true
142143
save-always: true
143144

145+
- run: pixi run which pytest
146+
144147
- name: Run tests
145148
run:
146149
pixi run -e ${{ matrix.pixi-env }} python -m pytest -n ${{ matrix.numprocesses || 4 }}
@@ -149,23 +152,23 @@ jobs:
149152
--cov-report=xml
150153
--junitxml=pytest.xml
151154

152-
- name: Upload test results
153-
if: always()
154-
uses: actions/upload-artifact@v5
155-
with:
156-
name: Test results for OS ${{ runner.os }} pixi-env ${{ matrix.pixi-env }} pytest-addopts ${{ matrix.pytest-addopts }}
157-
path: pytest.xml
155+
# - name: Upload test results
156+
# if: always()
157+
# uses: actions/upload-artifact@v5
158+
# with:
159+
# name: Test results for OS ${{ runner.os }} pixi-env ${{ matrix.pixi-env }} pytest-addopts ${{ matrix.pytest-addopts }}
160+
# path: pytest.xml
158161

159-
- name: Upload code coverage to Codecov
160-
uses: codecov/codecov-action@v5.5.1
161-
env:
162-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
163-
with:
164-
file: ./coverage.xml
165-
flags: unittests
166-
env_vars: RUNNER_OS,PYTHON_VERSION
167-
name: codecov-umbrella
168-
fail_ci_if_error: false
162+
# - name: Upload code coverage to Codecov
163+
# uses: codecov/codecov-action@v5.5.1
164+
# env:
165+
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
166+
# with:
167+
# file: ./coverage.xml
168+
# flags: unittests
169+
# env_vars: RUNNER_OS,PYTHON_VERSION
170+
# name: codecov-umbrella
171+
# fail_ci_if_error: false
169172

170173
event_file:
171174
name: "Event File"

‎.github/workflows/hypothesis.yaml‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- "main"
6+
- "test-pixi-dust"
67
pull_request:
78
branches:
89
- "main"
@@ -19,19 +20,19 @@ jobs:
1920
detect-ci-trigger:
2021
name: detect ci trigger
2122
runs-on: ubuntu-latest
22-
if: |
23-
github.repository == 'pydata/xarray'
24-
&& (github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule')
23+
# if: |
24+
# github.repository == 'pydata/xarray'
25+
# && (github.event_name == 'push' || github.event_name == 'pull_request')
2526
outputs:
26-
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
27+
triggered: false
2728
steps:
2829
- uses: actions/checkout@v5
2930
with:
3031
fetch-depth: 2
31-
- uses: xarray-contrib/ci-trigger@v1
32-
id: detect-trigger
33-
with:
34-
keyword: "[skip-ci]"
32+
# - uses: xarray-contrib/ci-trigger@v1
33+
# id: detect-trigger
34+
# with:
35+
# keyword: "[skip-ci]"
3536

3637
cache-pixi-lock:
3738
uses: ./.github/workflows/cache-pixi-lock.yml
@@ -86,15 +87,15 @@ jobs:
8687
run: |
8788
pixi run -e ${{ env.PIXI_ENV }} python xarray/util/print_versions.py
8889
89-
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
90-
- name: Restore cached hypothesis directory
91-
id: restore-hypothesis-cache
92-
uses: actions/cache/restore@v4
93-
with:
94-
path: .hypothesis/
95-
key: cache-hypothesis-${{ runner.os }}-${{ github.run_id }}
96-
restore-keys: |
97-
cache-hypothesis-
90+
# # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
91+
# - name: Restore cached hypothesis directory
92+
# id: restore-hypothesis-cache
93+
# uses: actions/cache/restore@v4
94+
# with:
95+
# path: .hypothesis/
96+
# key: cache-hypothesis-${{ runner.os }}-${{ github.run_id }}
97+
# restore-keys: |
98+
# cache-hypothesis-
9899

99100
- name: Run slow Hypothesis tests
100101
if: success()
@@ -103,23 +104,23 @@ jobs:
103104
pixi run -e ${{ env.PIXI_ENV }} python -m pytest --hypothesis-show-statistics --run-slow-hypothesis properties/*.py \
104105
--report-log output-${{ matrix.python-version }}-log.jsonl
105106
106-
# explicitly save the cache so it gets updated, also do this even if it fails.
107-
- name: Save cached hypothesis directory
108-
id: save-hypothesis-cache
109-
if: always() && steps.status.outcome != 'skipped'
110-
uses: actions/cache/save@v4
111-
with:
112-
path: .hypothesis/
113-
key: cache-hypothesis-${{ runner.os }}-${{ github.run_id }}
107+
# # explicitly save the cache so it gets updated, also do this even if it fails.
108+
# - name: Save cached hypothesis directory
109+
# id: save-hypothesis-cache
110+
# if: always() && steps.status.outcome != 'skipped'
111+
# uses: actions/cache/save@v4
112+
# with:
113+
# path: .hypothesis/
114+
# key: cache-hypothesis-${{ runner.os }}-${{ github.run_id }}
114115

115-
- name: Generate and publish the report
116-
if: |
117-
failure()
118-
&& steps.status.outcome == 'failure'
119-
&& github.event_name == 'schedule'
120-
&& github.repository_owner == 'pydata'
121-
uses: scientific-python/issue-from-pytest-log-action@v1
122-
with:
123-
log-path: output-${{ matrix.python-version }}-log.jsonl
124-
issue-title: "Nightly Hypothesis tests failed"
125-
issue-label: "topic-hypothesis"
116+
# - name: Generate and publish the report
117+
# if: |
118+
# failure()
119+
# && steps.status.outcome == 'failure'
120+
# && github.event_name == 'schedule'
121+
# && github.repository_owner == 'pydata'
122+
# uses: scientific-python/issue-from-pytest-log-action@v1
123+
# with:
124+
# log-path: output-${{ matrix.python-version }}-log.jsonl
125+
# issue-title: "Nightly Hypothesis tests failed"
126+
# issue-label: "topic-hypothesis"

0 commit comments

Comments
 (0)