Skip to content

Commit f353c62

Browse files
knocteknocte
committed
Merge remote-tracking branch 'origin/stable' into wip/fixMasterBranchCI
To try to fix CI, mainly migrating from .NET6 to .NET8. Conflicts: .github/workflows/CI.yml scripts/make.fsx src/GWallet.Backend.Tests/ExceptionMarshalling.fs src/GWallet.Frontend.Console/GWallet.Frontend.Console.fsproj
2 parents a0b9371 + 23f4445 commit f353c62

File tree

4 files changed

+83
-59
lines changed

4 files changed

+83
-59
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 74 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
- cron: "0 0 * * *"
1111

1212
env:
13+
DOTNET_VERSION: '8.0'
14+
1315
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
1416
FSXC_VERSION: 0.5.9.1
1517

@@ -19,16 +21,16 @@ env:
1921
# (msbuild bug?)
2022

2123
jobs:
22-
macOS--dotnet6-and-mono:
24+
macOS--dotnet-and-mono:
2325
runs-on: macOS-13
2426
steps:
2527
- uses: actions/checkout@v1
2628
with:
2729
submodules: false
28-
- name: Setup .NET SDK 6.0.x
29-
uses: actions/setup-dotnet@v1.7.2
30+
- name: Setup .NET SDK
31+
uses: actions/setup-dotnet@v5
3032
with:
31-
dotnet-version: '6.0.113'
33+
dotnet-version: ${{ env.DOTNET_VERSION }}
3234
- name: Install specific Xamarin.iOS and Xamarin.Android versions
3335
run: |
3436
wget https://download.visualstudio.microsoft.com/download/pr/81c41aaa-a3d7-4875-8416-d04b472379b7/21d9f6c5ad3a6bc2479b2ec4b0685b6c/xamarin.ios-16.0.0.72.pkg
@@ -60,6 +62,9 @@ jobs:
6062
6163
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
6264
65+
# fsxc was built with .NET6.x
66+
export DOTNET_ROLL_FORWARD=major
67+
6368
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
6469
6570
macOS--mono-only:
@@ -96,16 +101,16 @@ jobs:
96101
- name: integration tests
97102
run: make update-servers
98103

99-
macOS--dotnet6-only:
104+
macOS--dotnet-only:
100105
runs-on: macOS-13
101106
steps:
102107
- uses: actions/checkout@v1
103108
with:
104109
submodules: false
105-
- name: Setup .NET SDK 6.0.x
106-
uses: actions/setup-dotnet@v1.7.2
110+
- name: Setup .NET SDK
111+
uses: actions/setup-dotnet@v5
107112
with:
108-
dotnet-version: '6.0.113'
113+
dotnet-version: ${{ env.DOTNET_VERSION }}
109114
- name: HACK to emulate mono uninstall
110115
run: sudo rm -f `which mono` && sudo rm -f `which msbuild`
111116
- name: configure
@@ -128,18 +133,21 @@ jobs:
128133
129134
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
130135
136+
# fsxc was built with .NET6.x
137+
export DOTNET_ROLL_FORWARD=major
138+
131139
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
132140
133-
windows--dotnet6-and-legacyFramework:
141+
windows--dotnet-and-legacyFramework:
134142
runs-on: windows-latest
135143
steps:
136144
- uses: actions/checkout@v1
137145
with:
138146
submodules: false
139-
- name: Setup .NET SDK 6.0.x
140-
uses: actions/setup-dotnet@v1.7.2
147+
- name: Setup .NET SDK
148+
uses: actions/setup-dotnet@v5
141149
with:
142-
dotnet-version: '6.0.113'
150+
dotnet-version: ${{ env.DOTNET_VERSION }}
143151
- name: configure
144152
run: .\configure.bat
145153
- name: build in DEBUG mode
@@ -161,10 +169,13 @@ jobs:
161169
162170
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
163171
172+
# fsxc was built with .NET6.x
173+
export DOTNET_ROLL_FORWARD=major
174+
164175
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
165176
166177
windows--legacyFramework-only:
167-
runs-on: windows-2019
178+
runs-on: windows-2022
168179
steps:
169180
- uses: actions/checkout@v1
170181
with:
@@ -186,16 +197,16 @@ jobs:
186197
- name: integration tests
187198
run: .\make update-servers
188199

189-
windows--dotnet6-only:
200+
windows--dotnet-only:
190201
runs-on: windows-latest
191202
steps:
192203
- uses: actions/checkout@v1
193204
with:
194205
submodules: false
195-
- name: Setup .NET SDK 6.0.x
196-
uses: actions/setup-dotnet@v1.7.2
206+
- name: Setup .NET SDK
207+
uses: actions/setup-dotnet@v5
197208
with:
198-
dotnet-version: '6.0.113'
209+
dotnet-version: ${{ env.DOTNET_VERSION }}
199210
- name: HACK to emulate legacy .NETFramework uninstall
200211
run: del $(& "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -find MSBuild\\**\\Bin\\MSBuild.exe)
201212
- name: configure
@@ -219,6 +230,9 @@ jobs:
219230
220231
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
221232
233+
# fsxc was built with .NET6.x
234+
export DOTNET_ROLL_FORWARD=major
235+
222236
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
223237
224238
linux24-github--dotnet-and-mono:
@@ -228,9 +242,9 @@ jobs:
228242
with:
229243
submodules: false
230244
- name: install missing dependencies
231-
run: sudo apt install --yes fsharp nunit-console
232-
- name: check mono version
233-
run: mono --version
245+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
246+
- name: check runtime version(s)
247+
run: mono --version; dotnet --version
234248
- name: configure
235249
run: ./configure.sh
236250
- name: build in DEBUG mode
@@ -260,11 +274,11 @@ jobs:
260274
with:
261275
submodules: false
262276
- name: install missing dependencies
263-
run: sudo apt install --yes fsharp nunit-console
277+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
264278
- name: install last version of mono (Microsoft APT repositories)
265279
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
266-
- name: check mono version
267-
run: mono --version
280+
- name: check runtime version(s)
281+
run: mono --version; dotnet --version
268282
- name: install GTK libs (dependency of GTK frontend)
269283
run: sudo apt install --yes libgtk2.0-cil-dev
270284
- name: configure
@@ -313,7 +327,7 @@ jobs:
313327
- name: ownership workaround
314328
run: git config --global --add safe.directory '*'
315329

316-
- name: check mono version
330+
- name: check runtime version(s)
317331
run: mono --version
318332
- name: configure
319333
run: ./configure.sh
@@ -330,7 +344,7 @@ jobs:
330344
- name: integration tests
331345
run: make update-servers
332346

333-
linux24-vanilla--stockdotnet6-only:
347+
linux24-vanilla--stockdotnet-only:
334348
runs-on: ubuntu-24.04
335349
container:
336350
image: "ubuntu:24.04"
@@ -343,7 +357,7 @@ jobs:
343357
- name: install sudo
344358
run: apt update && apt install --yes sudo
345359
- name: install all dependencies
346-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
360+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet8
347361

348362
# workaround for https://github.com/actions/runner/issues/2033
349363
- name: ownership workaround
@@ -369,9 +383,12 @@ jobs:
369383
370384
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
371385
386+
# fsxc was built with .NET6.x
387+
export DOTNET_ROLL_FORWARD=major
388+
372389
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
373390
374-
linux24-vanilla--stockdotnet6-and-newmono:
391+
linux24-vanilla--stockdotnet-and-newmono:
375392
runs-on: ubuntu-24.04
376393
container:
377394
image: "ubuntu:24.04"
@@ -384,7 +401,7 @@ jobs:
384401
- name: install sudo
385402
run: apt update && apt install --yes sudo
386403
- name: install all dependencies
387-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
404+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet8
388405
- name: install last version of mono (Microsoft APT repositories)
389406
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
390407

@@ -412,9 +429,12 @@ jobs:
412429
413430
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
414431
432+
# fsxc was built with .NET6.x
433+
export DOTNET_ROLL_FORWARD=major
434+
415435
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
416436
417-
linux24-vanilla--stockdotnet6-and-stockmono:
437+
linux24-vanilla--stockdotnet-and-stockmono:
418438
runs-on: ubuntu-24.04
419439
container:
420440
image: "ubuntu:24.04"
@@ -427,7 +447,7 @@ jobs:
427447
- name: install sudo
428448
run: apt update && apt install --yes sudo
429449
- name: install all dependencies
430-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6 mono-xbuild fsharp
450+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet8 mono-xbuild fsharp
431451
- name: install GTK libs (dependency of GTK frontend)
432452
run: sudo apt install --yes libgtk2.0-cil-dev
433453
# workaround for https://github.com/actions/runner/issues/2033
@@ -454,6 +474,9 @@ jobs:
454474
455475
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
456476
477+
# fsxc was built with .NET6.x
478+
export DOTNET_ROLL_FORWARD=major
479+
457480
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
458481
459482
linux24-vanilla--newmono-only:
@@ -477,7 +500,7 @@ jobs:
477500
- name: ownership workaround
478501
run: git config --global --add safe.directory '*'
479502

480-
- name: check mono version
503+
- name: check runtime version(s)
481504
run: mono --version
482505
- name: install GTK libs (dependency of GTK frontend)
483506
run: sudo apt install --yes libgtk2.0-cil-dev
@@ -504,9 +527,9 @@ jobs:
504527
with:
505528
submodules: false
506529
- name: install missing dependencies
507-
run: sudo apt install --yes fsharp nunit-console
508-
- name: check mono version
509-
run: mono --version
530+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
531+
- name: check runtime version(s)
532+
run: mono --version; dotnet --version
510533
- name: configure
511534
run: ./configure.sh
512535
- name: build in DEBUG mode
@@ -533,14 +556,12 @@ jobs:
533556
runs-on: ubuntu-22.04
534557
steps:
535558
- uses: actions/checkout@v1
536-
with:
537-
submodules: false
538559
- name: install missing dependencies
539-
run: sudo apt install --yes fsharp nunit-console
560+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
540561
- name: install last version of mono (Microsoft APT repositories)
541562
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
542-
- name: check mono version
543-
run: mono --version
563+
- name: check runtime version(s)
564+
run: mono --version; dotnet --version
544565
- name: install GTK libs (dependency of GTK frontend)
545566
run: sudo apt install --yes libgtk2.0-cil-dev
546567
- name: configure
@@ -589,7 +610,7 @@ jobs:
589610
- name: ownership workaround
590611
run: git config --global --add safe.directory '*'
591612

592-
- name: check mono version
613+
- name: check runtime version(s)
593614
run: mono --version
594615
- name: configure
595616
run: ./configure.sh
@@ -606,7 +627,7 @@ jobs:
606627
- name: integration tests
607628
run: make update-servers
608629

609-
linux22-vanilla--stockdotnet6-only:
630+
linux22-vanilla--stockdotnet-only:
610631
runs-on: ubuntu-22.04
611632
container:
612633
image: "ubuntu:22.04"
@@ -647,7 +668,7 @@ jobs:
647668
648669
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
649670
650-
linux22-vanilla--stockdotnet6-and-newmono:
671+
linux22-vanilla--stockdotnet-and-newmono:
651672
runs-on: ubuntu-22.04
652673
container:
653674
image: "ubuntu:22.04"
@@ -690,7 +711,7 @@ jobs:
690711
691712
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
692713
693-
linux22-vanilla--stockdotnet6-and-stockmono:
714+
linux22-vanilla--stockdotnet-and-stockmono:
694715
runs-on: ubuntu-22.04
695716
container:
696717
image: "ubuntu:22.04"
@@ -753,7 +774,7 @@ jobs:
753774
- name: ownership workaround
754775
run: git config --global --add safe.directory '*'
755776

756-
- name: check mono version
777+
- name: check runtime version(s)
757778
run: mono --version
758779
- name: install GTK libs (dependency of GTK frontend)
759780
run: sudo apt install --yes libgtk2.0-cil-dev
@@ -782,22 +803,19 @@ jobs:
782803
- linux24-github--dotnet-and-newmono
783804
- linux24-vanilla--stockmono-only
784805
- linux24-vanilla--newmono-only
785-
- linux24-vanilla--stockdotnet6-only
786-
- linux24-vanilla--stockdotnet6-and-stockmono
787-
- linux24-vanilla--stockdotnet6-and-newmono
806+
- linux24-vanilla--stockdotnet-only
807+
- linux24-vanilla--stockdotnet-and-stockmono
808+
- linux24-vanilla--stockdotnet-and-newmono
788809
- linux22-github--dotnet-and-mono
789810
- linux22-github--dotnet-and-newmono
790811
- linux22-vanilla--stockmono-only
791812
- linux22-vanilla--newmono-only
792-
- linux22-vanilla--stockdotnet6-only
793-
- linux22-vanilla--stockdotnet6-and-stockmono
794-
- linux22-vanilla--stockdotnet6-and-newmono
795-
- windows--dotnet6-and-legacyFramework
813+
- windows--dotnet-and-legacyFramework
796814
- windows--legacyFramework-only
797-
- windows--dotnet6-only
798-
- macOS--dotnet6-and-mono
815+
- windows--dotnet-only
816+
- macOS--dotnet-and-mono
799817
- macOS--mono-only
800-
- macOS--dotnet6-only
818+
- macOS--dotnet-only
801819

802820
steps:
803821
- uses: actions/checkout@v1
@@ -808,7 +826,7 @@ jobs:
808826
which sudo 2>/dev/null || (apt update && apt install --yes sudo)
809827
sudo apt update
810828
811-
sudo apt install --yes git npm curl
829+
sudo DEBIAN_FRONTEND=noninteractive apt install --yes git npm curl
812830
sudo npm install --global n
813831
sudo n lts
814832
# workaround for https://github.com/actions/runner/issues/2033
@@ -857,7 +875,7 @@ jobs:
857875
- name: Test snap
858876
run: geewallet --version
859877

860-
- uses: actions/upload-artifact@v3
878+
- uses: actions/upload-artifact@v4
861879
name: Upload snap package as artifact
862880
with:
863881
name: snap

0 commit comments

Comments
 (0)