Skip to content

Commit 2dd7c38

Browse files
authored
Merge branch 'master' into revert-9-ak96/fix-new-json
2 parents b9b7011 + bd2e3b0 commit 2dd7c38

2 files changed

Lines changed: 14 additions & 34 deletions

File tree

.github/workflows/CI.yml

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
jobs:
14-
job1:
14+
generate_matrix:
1515
name: "Prepare Tests"
1616
runs-on: ubuntu-latest
1717
outputs:
@@ -21,32 +21,15 @@ jobs:
2121
- id: set-matrix
2222
run: |
2323
echo "matrix={\"node\":[$(python getter.py)]}" >> $GITHUB_OUTPUT
24-
- name: "Set Up Julia"
25-
uses: julia-actions/setup-julia@v2
26-
with:
27-
version: "1.10"
28-
- uses: julia-actions/cache@v2
29-
with:
30-
cache-name: julia-cache;workflow=${{ github.workflow }};ref=${{ github.run_id }}
31-
include-matrix: false
32-
- name: "Install julia pre-requisites"
33-
run: |
34-
julia -e '
35-
using Pkg
36-
Pkg.add("Oscar")
37-
Pkg.add("BenchmarkTools")
38-
Pkg.add("GraphRecipes")
39-
Pkg.add("Graphs")
40-
Pkg.add("Interact")
41-
Pkg.add("Plots")'
42-
job2:
24+
25+
run_notebook:
4326
needs:
44-
- job1
27+
- generate_matrix
4528
name: "Run tests"
4629
runs-on: ubuntu-latest
4730
strategy:
4831
fail-fast: false
49-
matrix: ${{fromJSON(needs.job1.outputs.matrix)}}
32+
matrix: ${{fromJSON(needs.generate_matrix.outputs.matrix)}}
5033
timeout-minutes: 60
5134
steps:
5235
- name: "Set Up Julia"
@@ -70,18 +53,16 @@ jobs:
7053
run: |
7154
julia -e '
7255
using Pkg
73-
Pkg.add("Oscar")
74-
Pkg.add("BenchmarkTools")
75-
Pkg.add("GraphRecipes")
76-
Pkg.add("Graphs")
77-
Pkg.add("Interact")
78-
Pkg.add("IJulia")
79-
Pkg.add("Plots")'
56+
Pkg.add([
57+
"IJulia",
58+
"Oscar",
59+
"BenchmarkTools",
60+
"GraphRecipes",
61+
"Graphs",
62+
"Interact",
63+
"Plots",
64+
])'
8065
- run: mkdir -pv notebooks
81-
- name: Use default julia environment
82-
run: |
83-
cat ~/.local/share/jupyter/kernels/julia-1.10/kernel.json | sed 's/^.*project=.*$//' > ~/.local/share/jupyter/kernels/julia-1.10/kernel.json.new
84-
mv -v ~/.local/share/jupyter/kernels/julia-1.10/kernel.json.new ~/.local/share/jupyter/kernels/julia-1.10/kernel.json
8566
- run: python3 tester.py ${{ matrix.node }}
8667
- name: Upload new notebook
8768
uses: actions/upload-artifact@v4

tester.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@
1717
print(f"Running {repo}/{filename}...")
1818
subprocess.run(f'''jupytext --set-kernel "julia-1.10" --execute {nbfilename}''', shell=True, check=True)
1919
print(f"{repo}/{filename} tested successfully!")
20-

0 commit comments

Comments
 (0)