diff --git a/.github/workflows/deploy-on-release.yml b/.github/workflows/deploy-on-release.yml index ab4e0573c..7697388d0 100644 --- a/.github/workflows/deploy-on-release.yml +++ b/.github/workflows/deploy-on-release.yml @@ -118,7 +118,7 @@ jobs: ref: v2.9.10 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.3.1 + uses: microsoft/setup-msbuild@v2 if: runner.os == 'Windows' - name: Prepare Windows environment @@ -269,11 +269,12 @@ jobs: uses: actions/upload-artifact@v4 with: path: ./build/dist/* + name: ${{ matrix.config.os }} wheels: needs: setup-jobs if: needs.setup-jobs.outputs.allowed-jobs == 'Wheels' || needs.setup-jobs.outputs.allowed-jobs == 'All' - name: ${{ matrix.name }} ${{ matrix.py }} wheels + name: ${{ matrix.name }} ${{ matrix.py }} wheel runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -359,6 +360,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl + name: ${{ matrix.name }}-${{ matrix.py }}-wheel - name: Publish Python wheels if: needs.setup-jobs.outputs.binaries-destination == 'Publish' @@ -440,6 +442,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: ${{ steps.package-javascript.outputs.files }} + name: libcellml.js - name: Publish libcellml.js if: needs.setup-jobs.outputs.binaries-destination == 'Publish' diff --git a/CMakeLists.txt b/CMakeLists.txt index 874fbef05..36e345d4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Minimum OS X deployment vers set(PROJECT_NAME libCellML) set(PROJECT_URL https://libcellml.org) set(_PROJECT_VERSION 0.6.0) -set(PROJECT_DEVELOPER_VERSION -rc.2) +set(PROJECT_DEVELOPER_VERSION -rc.3) project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX) # Set policies that affect the build. diff --git a/docs/changelogs/changelog_v0.6.0-rc.2.rst b/docs/changelogs/changelog_v0.6.0-rc.3.rst similarity index 95% rename from docs/changelogs/changelog_v0.6.0-rc.2.rst rename to docs/changelogs/changelog_v0.6.0-rc.3.rst index ef8b47be5..cfd4ed246 100644 --- a/docs/changelogs/changelog_v0.6.0-rc.2.rst +++ b/docs/changelogs/changelog_v0.6.0-rc.3.rst @@ -1,4 +1,4 @@ -libCellML v0.6.0-rc.2 Changelog +libCellML v0.6.0-rc.3 Changelog =============================== Analyser @@ -39,6 +39,7 @@ Infrastructure No category ----------- +* CI build fixes by `@hsorby `_ [`#1268 `_]. * Generator: `computeComputedConstants()` may not generate some dependencies in the right place by `@agarny `_ [`#1217 `_]. * Generator: use `size_t` rather than `int` in `nlaSolve()` by `@agarny `_ [`#1202 `_]. diff --git a/docs/changelogs/index.rst b/docs/changelogs/index.rst index 5a4562f95..ef6df5d2e 100644 --- a/docs/changelogs/index.rst +++ b/docs/changelogs/index.rst @@ -4,7 +4,7 @@ Changelogs .. toctree:: - changelog_v0.6.0-rc.2 + changelog_v0.6.0-rc.3 changelog_v0.5.0 changelog_v0.4.0 changelog_v0.3.104 diff --git a/docs/index.rst b/docs/index.rst index d82703a1f..dd71a0a95 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -39,7 +39,7 @@ Changelogs .. toctree:: - changelogs/changelog_v0.6.0-rc.2 + changelogs/changelog_v0.6.0-rc.3 changelogs/changelog_v0.5.0 changelogs/changelog_v0.4.0 changelogs/changelog_v0.3.104