Skip to content

Commit 5eb1f8f

Browse files
committed
Merge branch 'master' into develop
2 parents 4e4a377 + da08c50 commit 5eb1f8f

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

.github/workflows/test-package-pypi.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ jobs:
3535
curl -LO https://raw.githubusercontent.com/easyscience/diffraction-lib/master/pixi/prod/pixi.toml
3636
3737
- name: Download the tests from the master branch
38+
shell: bash
3839
run: |
3940
curl -LO https://github.com/easyscience/diffraction-lib/archive/refs/heads/master.zip
40-
unzip master.zip "diffraction-lib-master/tests/*" -d .
41-
mv diffraction-lib-master/tests ./tests
41+
unzip master.zip -d .
42+
mkdir -p tests
43+
cp -r diffraction-lib-master/tests/* tests/
4244
rm -rf master.zip diffraction-lib-master
4345
4446
- name: Create the environment and install dependencies
Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
11
name: Test tutorials nightly (develop)
22

33
on:
4+
# Run daily, at 00:00.
45
schedule:
5-
- cron: '0 0 * * *' # Every midnight UTC
6+
- cron: '0 0 * * *'
7+
# Allows you to run this workflow manually from the Actions tab
8+
workflow_dispatch:
69

710
jobs:
811
call-tutorials:
9-
if: github.ref_name == 'develop'
10-
uses: ./.github/workflows/test-tutorials.yaml
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout develop branch
16+
uses: actions/checkout@v4
17+
with:
18+
ref: develop
19+
20+
- name: Trigger test-tutorials workflow
21+
uses: actions/github-script@v7
22+
with:
23+
github-token: ${{ secrets.GITHUB_TOKEN }}
24+
script: |
25+
await github.rest.actions.createWorkflowDispatch({
26+
owner: context.repo.owner,
27+
repo: context.repo.repo,
28+
workflow_id: "test-tutorials.yaml",
29+
ref: "develop"
30+
});

pixi.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ code-quality = { depends-on = [
128128
"py-lint-fix",
129129
"py-format-fix",
130130
"nonpy-format-fix",
131-
"notebook-format-fix",
132131
] }
133132

134133
# 📓 Notebook Management

0 commit comments

Comments
 (0)