Merge branch 'QuantumSavory:master' into clcontroller

.github/workflows/ci-julia-nightly.yml

@@ -4,6 +4,14 @@ on:
     branches: [master, main]
     tags: ["*"]
   pull_request:
+
+concurrency:
+  # group by workflow and ref; the last slightly strange component ensures that for pull
+  # requests, we limit to 1 concurrent job, but for the master branch we don't
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main') || github.run_number }}
+  # Cancel intermediate builds, but only if it is a pull request build.
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
 env:
   PYTHON: ~
 jobs:
@@ -36,7 +44,7 @@ jobs:
           JULIA_NUM_THREADS: ${{ matrix.threads }}
           JET_TEST: ${{ matrix.jet }}
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           file: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci.yml

@@ -4,6 +4,14 @@ on:
     branches: [master, main]
     tags: ["*"]
   pull_request:
+
+concurrency:
+  # group by workflow and ref; the last slightly strange component ensures that for pull
+  # requests, we limit to 1 concurrent job, but for the master branch we don't
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main') || github.run_number }}
+  # Cancel intermediate builds, but only if it is a pull request build.
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
 env:
   PYTHON: ~
 jobs:
@@ -19,7 +27,8 @@ jobs:
         os:
           - ubuntu-latest
         threads:
-          - '2'
+          - '1'
+          - '5'
         arch:
           - x64
         include:
@@ -34,7 +43,7 @@ jobs:
           - arch: x64
             os: windows-latest
             version: '1'
-            threads: '1'  
+            threads: '1'
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v1
@@ -47,7 +56,7 @@ jobs:
         env:
           JULIA_NUM_THREADS: ${{ matrix.threads }}
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           file: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}

Project.toml

@@ -34,7 +34,7 @@ QuantumSavoryMakie = "Makie"
 
 [compat]
 Combinatorics = "1"
-ConcurrentSim = "1.4.1"
+ConcurrentSim = "1.5"
 Distributions = "0.25.90"
 DocStringExtensions = "0.9"
 Graphs = "1.9"
@@ -51,7 +51,7 @@ QuantumOpticsBase = "0.5.3"
 QuantumSymbolics = "0.4.3"
 Random = "1"
 Reexport = "1.2.2"
-ResumableFunctions = "0.6.9"
+ResumableFunctions = "1"
 Statistics = "1"
 SumTypes = "0.5.5"
 julia = "1.10"