diff --git a/.github/workflows/ci-julia-nightly.yml b/.github/workflows/ci-julia-nightly.yml index 94e3854..17506a3 100644 --- a/.github/workflows/ci-julia-nightly.yml +++ b/.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 }} \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b92fb4c..705c365 100644 --- a/.github/workflows/ci.yml +++ b/.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: @@ -14,18 +22,28 @@ jobs: fail-fast: false matrix: version: - - '1.6' - - '1.7' - - '1.8' - - '1.9' - - '1.10' - '1' + - '1.10' os: - ubuntu-latest threads: - '1' + - '5' arch: - x64 + include: + - arch: aarch64 + os: macos-latest + version: '1' + threads: '1' + - arch: x64 + os: macos-latest + version: '1' + threads: '1' + - arch: x64 + os: windows-latest + version: '1' + threads: '1' steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 @@ -38,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 }} diff --git a/.github/workflows/downgrade.yml b/.github/workflows/downgrade.yml index d4345ba..89a4681 100644 --- a/.github/workflows/downgrade.yml +++ b/.github/workflows/downgrade.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['1.9'] + version: ['1.10'] steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index d2aca90..9c54b7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # News -## v1.4.1 - 2024-05-03 +## v1.5.0 - 2024-11-23 + +- Bump ResumableFunctions compat to 1.0.0. +- Bump Julia compat to 1.10 +## v1.4.1 - 2024-05-03 - Permit stores `put!` methods to cast the value being placed to the type appropriate for the given store. - Added examples to the documentation that were lost around the time of the rewrite for v0.5 in 2018. diff --git a/Project.toml b/Project.toml index 4db9c5d..ac12c6f 100644 --- a/Project.toml +++ b/Project.toml @@ -3,9 +3,9 @@ uuid = "6ed1e86c-fcaf-46a9-97e0-2b26a2cdb499" keywords = ["discrete-even simulation"] license = "MIT" desc = "A discrete event process oriented simulation framework." -authors = ["Ben Lauwens and SimJulia and ConcurrentSim contributors"] +authors = ["Ben Lauwens and SimJulia, ConcurrentSim, QuantumSavory contributors"] repo = "https://github.com/JuliaDynamics/ConcurrentSim.jl.git" -version = "1.4.1" +version = "1.5.0" [deps] DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" @@ -15,5 +15,5 @@ ResumableFunctions = "c5292f4c-5179-55e1-98c5-05642aab7184" [compat] DataStructures = "0.18" Dates = "1" -ResumableFunctions = "0.6" -julia = "1.6" +ResumableFunctions = "1" +julia = "1.10"