Skip to content

Commit 29a90ca

Browse files
committed
Merge branch 'main' into 'eric-devel'
2 parents f57b3ae + c5b8060 commit 29a90ca

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ task:
22
matrix:
33
- name: FreeBSD
44
freebsd_instance:
5-
image_family: freebsd-13-2
5+
image_family: freebsd-13-3
66
env:
77
matrix:
88
- JULIA_VERSION: 1.6

.github/workflows/CI.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ jobs:
1515
test:
1616
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
1717
runs-on: ${{ matrix.os }}
18+
continue-on-error: ${{ matrix.version == 'nightly' }}
19+
timeout-minutes: 60
20+
permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
21+
actions: write
22+
contents: read
1823
strategy:
1924
fail-fast: false
2025
matrix:
@@ -29,15 +34,17 @@ jobs:
2934
- x64
3035
- x86
3136
steps:
32-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3338
- uses: julia-actions/setup-julia@v2
3439
with:
3540
version: ${{ matrix.version }}
3641
arch: ${{ matrix.arch }}
37-
- uses: julia-actions/cache@v1
42+
- uses: julia-actions/cache@v2
3843
- uses: julia-actions/julia-buildpkg@v1
3944
- uses: julia-actions/julia-runtest@v1
4045
- uses: julia-actions/julia-processcoverage@v1
41-
- uses: codecov/codecov-action@v3
46+
- uses: codecov/codecov-action@v4
4247
with:
4348
files: lcov.info
49+
token: ${{ secrets.CODECOV_TOKEN }}
50+
fail_ci_if_error: false

Project.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "PRIMA"
22
uuid = "0a7d04aa-8ac2-47b3-b7a7-9dbd6ad661ed"
33
authors = ["Éric Thiébaut <[email protected]> and contributors"]
4-
version = "0.2.1"
4+
version = "0.2.2"
55

66
[deps]
77
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -22,7 +22,7 @@ CUTEst = "1.0.1"
2222
NLPModels = "0.21.3"
2323
PRIMA_jll = "0.7.1"
2424
Requires = "1"
25-
TypeUtils = "0.3"
25+
TypeUtils = "0.3, 1"
2626
julia = "1.6"
2727

2828
[extras]

0 commit comments

Comments
 (0)