Skip to content

Commit 6a3b081

Browse files
committed
ci: small updates
1 parent 7ab55ff commit 6a3b081

File tree

1 file changed

+39
-37
lines changed

1 file changed

+39
-37
lines changed

.github/workflows/CD.yml

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -232,44 +232,11 @@ jobs:
232232
release_created: ${{ steps.release.outputs.release_created }}
233233
#if a release is created then run the deploy scripts for github.io, conda, pypi and docker
234234

235-
documentation-test:
236-
runs-on: ubuntu-24.04
237-
238-
steps:
239-
- uses: actions/checkout@v4
240-
- run: |
241-
cp CHANGELOG.md docs/source/CHANGELOG.md
242-
docker build . -t=docs -f docs/Dockerfile
243-
docker run -v $(pwd):/map2loop docs bash map2loop/docs/build_docs.sh
244-
- name: upload artifacts
245-
uses: actions/upload-artifact@v4
246-
with:
247-
name: docs
248-
path: docs/build/html
249235

250-
documentation-deploy:
251-
runs-on: ubuntu-24.04
252-
needs: [release-please, documentation-test]
253-
if: ${{ needs.release-please.outputs.release_created }} && github.ref == 'refs/heads/master'
254-
255-
steps:
256-
- uses: actions/checkout@v4
257-
- uses: actions/download-artifact@v4
258-
with:
259-
name: docs
260-
path: docs
261-
- name: ls
262-
run: |
263-
ls -l docs
264-
- name: Deploy 🚀
265-
uses: JamesIves/github-pages-deploy-action@v4
266-
with:
267-
branch: gh-pages # The branch the action should deploy to.
268-
folder: docs # The folder the action should deploy.
269236

270237
conda-upload:
271-
needs: [conda-build]
272-
if: github.ref == 'refs/heads/master'
238+
needs: [release-please, conda-build]
239+
273240
runs-on: ${{matrix.os}}
274241
strategy:
275242
fail-fast: false
@@ -279,7 +246,7 @@ jobs:
279246
# - macos-latest
280247
- windows-latest
281248
python-version: ["3.9", "3.10", "3.11", "3.12"]
282-
# if: ${{ needs.release-please.outputs.release_created }}
249+
if: ${{ needs.release-please.outputs.release_created }}
283250
steps:
284251
- uses: actions/download-artifact@v4
285252
with:
@@ -301,7 +268,7 @@ jobs:
301268
needs: [pypi-test-wheels]
302269
if: github.ref == 'refs/heads/master'
303270
runs-on:
304-
- ubuntu-24.04 # https://github.com/actions/runner-images/issues/10636
271+
- ubuntu-24.04
305272
# if: ${{ needs.release-please.outputs.release_created }}
306273
permissions:
307274
# IMPORTANT: this permission is mandatory for trusted publishing
@@ -315,3 +282,38 @@ jobs:
315282
with:
316283
skip-existing: true
317284
verbose: true
285+
286+
documentation-test:
287+
runs-on: ubuntu-24.04
288+
289+
steps:
290+
- uses: actions/checkout@v4
291+
- run: |
292+
cp CHANGELOG.md docs/source/CHANGELOG.md
293+
docker build . -t=docs -f docs/Dockerfile
294+
docker run -v $(pwd):/map2loop docs bash map2loop/docs/build_docs.sh
295+
- name: upload artifacts
296+
uses: actions/upload-artifact@v4
297+
with:
298+
name: docs
299+
path: docs/build/html
300+
301+
documentation-deploy:
302+
runs-on: ubuntu-24.04
303+
needs: [release-please, documentation-test]
304+
if: ${{ needs.release-please.outputs.release_created }} && github.ref == 'refs/heads/master'
305+
306+
steps:
307+
- uses: actions/checkout@v4
308+
- uses: actions/download-artifact@v4
309+
with:
310+
name: docs
311+
path: docs
312+
- name: ls
313+
run: |
314+
ls -l docs
315+
- name: Deploy 🚀
316+
uses: JamesIves/github-pages-deploy-action@v4
317+
with:
318+
branch: gh-pages # The branch the action should deploy to.
319+
folder: docs # The folder the action should deploy.

0 commit comments

Comments
 (0)