Skip to content

Commit d04f657

Browse files
Happypig375Happypig375
authored
Fix CI (#640)
1 parent bd74287 commit d04f657

26 files changed

+187
-178
lines changed

‎.github/workflows/Benchmark.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
Benchmark:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout
15+
- uses: actions/checkout@v6
1616

1717
- name: Setup .NET 10
18-
uses: actions/setup-dotnet
18+
uses: actions/setup-dotnet@v5
1919
with:
2020
dotnet-version: '10.x'
21-
include-prerelease: true
21+
dotnet-quality: 'preview'
2222

2323
- name: 'Inter version CPU benchmark'
2424
run: |

‎.github/workflows/CPPBuild.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@ jobs:
1919
- os: ubuntu-latest
2020
flag: linux-x64
2121
- os: macos-latest
22-
flag: osx-x64
22+
flag: osx-arm64
2323

2424
runs-on: ${{ matrix.os }}
2525

2626
steps:
27-
- uses: actions/checkout
27+
- uses: actions/checkout@v6
2828

2929
- name: Setup .NET 10
30-
uses: actions/setup-dotnet
30+
uses: actions/setup-dotnet@v5
3131
with:
3232
dotnet-version: '10.x'
33+
dotnet-quality: 'preview'
3334

3435
- name: 'Generating exports'
3536
run: |
@@ -49,14 +50,14 @@ jobs:
4950
cd Sources/Wrappers/AngouriMath.CPP.Exporting
5051
mkdir ../AngouriMath.CPP.Importing/out-x64
5152
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
52-
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -r ${{ matrix.flag }} -c release
53+
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -p:PublishAot=true -r ${{ matrix.flag }} -c release
5354
5455
- name: 'Building the library into native for Linux & MacOS'
5556
if: ${{ matrix.os != 'windows-latest' }}
5657
run: |
5758
cd Sources/Wrappers/AngouriMath.CPP.Exporting
5859
mkdir ../AngouriMath.CPP.Importing/out-x64
59-
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -r ${{ matrix.flag }} -c release
60+
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -p:PublishAot=true -r ${{ matrix.flag }} -c release
6061
6162
- name: 'Renaming the library for Linux'
6263
if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -72,7 +73,7 @@ jobs:
7273
install_name_tool -id "@rpath/libAngouriMath.CPP.Exporting.dylib" libAngouriMath.CPP.Exporting.dylib
7374
7475
- name: 'Uploading artifacts'
75-
uses: actions/upload-artifact
76+
uses: actions/upload-artifact@v6
7677
with:
7778
name: AngouriMath.CPP-${{ matrix.os }}-x64
7879
path: ./Sources/Wrappers/AngouriMath.CPP.Importing

‎.github/workflows/CPPTest.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ jobs:
2121
- os: ubuntu-latest
2222
flag: linux-x64
2323
- os: macos-latest
24-
flag: osx-x64
24+
flag: osx-arm64
2525

2626
runs-on: ${{ matrix.os }}
2727

2828
steps:
29-
- uses: actions/checkout
29+
- uses: actions/checkout@v6
3030

3131
- name: Setup .NET 10
32-
uses: actions/setup-dotnet
32+
uses: actions/setup-dotnet@v5
3333
with:
3434
dotnet-version: '10.x'
35-
include-prerelease: true
35+
dotnet-quality: 'preview'
3636

3737
- name: 'Install some libs for Linux'
3838
if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -47,14 +47,14 @@ jobs:
4747
cd Sources/Wrappers/AngouriMath.CPP.Exporting
4848
mkdir ../AngouriMath.CPP.Importing/out-x64
4949
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
50-
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -r ${{ matrix.flag }} -c release
50+
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -p:PublishAot=true -r ${{ matrix.flag }} -c release
5151
5252
- name: 'Building the library into native for Linux & MacOS'
5353
if: ${{ matrix.os != 'windows-latest' }}
5454
run: |
5555
cd Sources/Wrappers/AngouriMath.CPP.Exporting
5656
mkdir ../AngouriMath.CPP.Importing/out-x64
57-
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -r ${{ matrix.flag }} -c release
57+
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -p:PublishAot=true -r ${{ matrix.flag }} -c release
5858
5959
- name: 'Preparing tests'
6060
run: |
@@ -66,7 +66,8 @@ jobs:
6666
if: ${{ matrix.os == 'windows-latest' }}
6767
run: |
6868
cd ${{ env.tests_path }}
69-
copy "..\..\..\Wrappers\AngouriMath.CPP.Importing\out-x64\AngouriMath.CPP.Exporting.dll" "build\Debug\AngouriMath.CPP.Exporting.dll"
69+
copy "..\..\..\Wrappers\AngouriMath.CPP.Importing\out-x64\AngouriMath.CPP.Exporting.dll" "build\Debug\AngouriMath.CPP.Exporting.dll" # needed for run time
70+
copy "..\..\..\Wrappers\AngouriMath.CPP.Importing\out-x64\AngouriMath.CPP.Exporting.lib" "build\Debug\AngouriMath.CPP.Exporting.lib" # needed for link time
7071
7172
- name: 'Copying the library for Linux'
7273
if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -79,9 +80,6 @@ jobs:
7980
run: |
8081
cd ${{ env.tests_path }}
8182
cp -r "../../../Wrappers/AngouriMath.CPP.Importing/out-x64/AngouriMath.CPP.Exporting.dylib" "build/Debug/libAngouriMath.CPP.Exporting.dylib"
82-
cd build/Debug
83-
path=$(pwd)
84-
install_name_tool -id "$path/libAngouriMath.CPP.Exporting.dylib" libAngouriMath.CPP.Exporting.dylib
8583
8684
- name: 'Building and running tests'
8785
run: |
@@ -92,7 +90,7 @@ jobs:
9290
9391
- name: 'Upload logs'
9492
if: failure()
95-
uses: actions/upload-artifact
93+
uses: actions/upload-artifact@v6
9694
with:
9795
name: Logs
9896
path: ./Sources/Tests/CPPWrapperUnitTests/tests/build/Testing/Temporary

‎.github/workflows/CSharpBuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
matrix:
1616
os: [windows-latest, ubuntu-latest, macos-latest]
1717
steps:
18-
- uses: actions/checkout
18+
- uses: actions/checkout@v6
1919
with:
2020
submodules: 'recursive'
2121
- name: Setup .NET 10
22-
uses: actions/setup-dotnet
22+
uses: actions/setup-dotnet@v5
2323
with:
2424
dotnet-version: '10.x'
25-
include-prerelease: true
25+
dotnet-quality: 'preview'
2626

2727
- name: Build AngouriMath
2828
run: |

‎.github/workflows/CSharpTest.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818

1919
steps:
20-
- uses: actions/checkout
20+
- uses: actions/checkout@v6
2121
with:
2222
submodules: 'recursive'
2323

2424
- name: Setup .NET 10
25-
uses: actions/setup-dotnet
25+
uses: actions/setup-dotnet@v5
2626
with:
2727
dotnet-version: '10.x'
28-
include-prerelease: true
28+
dotnet-quality: 'preview'
2929

3030
- name: Build Tests # We need it to be able to retry
3131
run: |
@@ -51,14 +51,14 @@ jobs:
5151

5252
- name: 'Upload report as artifact'
5353
if: ${{ matrix.os == 'windows-latest' }}
54-
uses: actions/upload-artifact
54+
uses: actions/upload-artifact@v6
5555
with:
5656
name: Report
5757
path: ./Sources/Tests/UnitTests/coverage.opencover.xml
5858
retention-days: 3
5959

6060
- name: 'Send to codecov'
6161
if: ${{ matrix.os == 'windows-latest' }}
62-
uses: codecov/codecov-action
62+
uses: codecov/codecov-action@v5
6363
with:
6464
file: ./Sources/Tests/UnitTests/coverage.opencover.xml

‎.github/workflows/EverythingBuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
runs-on: windows-latest # Window application cannot be run on other OS
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v6
1717
with:
1818
submodules: 'recursive'
1919

2020
- name: Setup .NET 10
21-
uses: actions/setup-dotnet
21+
uses: actions/setup-dotnet@v5
2222
with:
2323
dotnet-version: '10.x'
24-
include-prerelease: true
24+
dotnet-quality: 'preview'
2525

2626
- name: Build AM
2727
run: dotnet build Sources/AngouriMath/AngouriMath/AngouriMath.csproj

‎.github/workflows/FSharpBuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818

1919
steps:
20-
- uses: actions/checkout
20+
- uses: actions/checkout@v6
2121
with:
2222
submodules: 'recursive'
2323

2424
- name: Setup .NET 10
25-
uses: actions/setup-dotnet
25+
uses: actions/setup-dotnet@v5
2626
with:
2727
dotnet-version: '10.x'
28-
include-prerelease: true
28+
dotnet-quality: 'preview'
2929

3030
- name: Build
3131
run: |

‎.github/workflows/FSharpTest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818

1919
steps:
20-
- uses: actions/checkout
20+
- uses: actions/checkout@v6
2121
with:
2222
submodules: 'recursive'
2323

2424
- name: Setup .NET 10
25-
uses: actions/setup-dotnet
25+
uses: actions/setup-dotnet@v5
2626
with:
2727
dotnet-version: '10.x'
28-
include-prerelease: true
28+
dotnet-quality: 'preview'
2929

3030
- name: Build Tests # We need it to be able to retry
3131
run: |

‎.github/workflows/IntegrationTest.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
ConsoleApp:
2020
runs-on: windows-latest
2121
steps:
22-
- uses: actions/checkout
23-
- uses: actions/setup-dotnet
22+
- uses: actions/checkout@v6
23+
- uses: actions/setup-dotnet@v5
2424
with:
2525
dotnet-version: '10.x'
26-
include-prerelease: true
26+
dotnet-quality: 'preview'
2727

2828
- name: 'Pack AngouriMath'
2929
run: |
@@ -61,11 +61,11 @@ jobs:
6161
ClassLibConsoleApp:
6262
runs-on: windows-latest
6363
steps:
64-
- uses: actions/checkout
65-
- uses: actions/setup-dotnet
64+
- uses: actions/checkout@v6
65+
- uses: actions/setup-dotnet@v5
6666
with:
6767
dotnet-version: '10.x'
68-
include-prerelease: true
68+
dotnet-quality: 'preview'
6969

7070
- name: 'Pack AngouriMath'
7171
run: |

‎.github/workflows/InteractiveBuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v6
2121
with:
2222
submodules: 'recursive'
2323

2424
- name: Setup .NET 10
25-
uses: actions/setup-dotnet
25+
uses: actions/setup-dotnet@v5
2626
with:
2727
dotnet-version: '10.x'
28-
include-prerelease: true
28+
dotnet-quality: 'preview'
2929

3030
- name: Build
3131
run: |

0 commit comments

Comments
 (0)