Skip to content

Commit 6e27eee

Browse files
knocteknocte
committed
Merge remote-tracking branch 'origin/stable' into wip/fixMasterBranchCI
To try to fix CI, mainly migrating from .NET6 to .NET8.
2 parents a0b9371 + 23f4445 commit 6e27eee

File tree

5 files changed

+80
-60
lines changed

5 files changed

+80
-60
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 71 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
@@ -130,16 +135,16 @@ jobs:
130135
131136
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
132137
133-
windows--dotnet6-and-legacyFramework:
138+
windows--dotnet-and-legacyFramework:
134139
runs-on: windows-latest
135140
steps:
136141
- uses: actions/checkout@v1
137142
with:
138143
submodules: false
139-
- name: Setup .NET SDK 6.0.x
140-
uses: actions/setup-dotnet@v1.7.2
144+
- name: Setup .NET SDK
145+
uses: actions/setup-dotnet@v5
141146
with:
142-
dotnet-version: '6.0.113'
147+
dotnet-version: ${{ env.DOTNET_VERSION }}
143148
- name: configure
144149
run: .\configure.bat
145150
- name: build in DEBUG mode
@@ -161,10 +166,13 @@ jobs:
161166
162167
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
163168
169+
# fsxc was built with .NET6.x
170+
export DOTNET_ROLL_FORWARD=major
171+
164172
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
165173
166174
windows--legacyFramework-only:
167-
runs-on: windows-2019
175+
runs-on: windows-2022
168176
steps:
169177
- uses: actions/checkout@v1
170178
with:
@@ -186,16 +194,16 @@ jobs:
186194
- name: integration tests
187195
run: .\make update-servers
188196

189-
windows--dotnet6-only:
197+
windows--dotnet-only:
190198
runs-on: windows-latest
191199
steps:
192200
- uses: actions/checkout@v1
193201
with:
194202
submodules: false
195-
- name: Setup .NET SDK 6.0.x
196-
uses: actions/setup-dotnet@v1.7.2
203+
- name: Setup .NET SDK
204+
uses: actions/setup-dotnet@v5
197205
with:
198-
dotnet-version: '6.0.113'
206+
dotnet-version: ${{ env.DOTNET_VERSION }}
199207
- name: HACK to emulate legacy .NETFramework uninstall
200208
run: del $(& "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -find MSBuild\\**\\Bin\\MSBuild.exe)
201209
- name: configure
@@ -219,6 +227,9 @@ jobs:
219227
220228
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
221229
230+
# fsxc was built with .NET6.x
231+
export DOTNET_ROLL_FORWARD=major
232+
222233
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
223234
224235
linux24-github--dotnet-and-mono:
@@ -228,9 +239,9 @@ jobs:
228239
with:
229240
submodules: false
230241
- name: install missing dependencies
231-
run: sudo apt install --yes fsharp nunit-console
232-
- name: check mono version
233-
run: mono --version
242+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
243+
- name: check runtime version(s)
244+
run: mono --version; dotnet --version
234245
- name: configure
235246
run: ./configure.sh
236247
- name: build in DEBUG mode
@@ -260,11 +271,11 @@ jobs:
260271
with:
261272
submodules: false
262273
- name: install missing dependencies
263-
run: sudo apt install --yes fsharp nunit-console
274+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
264275
- name: install last version of mono (Microsoft APT repositories)
265276
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
266-
- name: check mono version
267-
run: mono --version
277+
- name: check runtime version(s)
278+
run: mono --version; dotnet --version
268279
- name: install GTK libs (dependency of GTK frontend)
269280
run: sudo apt install --yes libgtk2.0-cil-dev
270281
- name: configure
@@ -313,7 +324,7 @@ jobs:
313324
- name: ownership workaround
314325
run: git config --global --add safe.directory '*'
315326

316-
- name: check mono version
327+
- name: check runtime version(s)
317328
run: mono --version
318329
- name: configure
319330
run: ./configure.sh
@@ -330,7 +341,7 @@ jobs:
330341
- name: integration tests
331342
run: make update-servers
332343

333-
linux24-vanilla--stockdotnet6-only:
344+
linux24-vanilla--stockdotnet-only:
334345
runs-on: ubuntu-24.04
335346
container:
336347
image: "ubuntu:24.04"
@@ -343,7 +354,7 @@ jobs:
343354
- name: install sudo
344355
run: apt update && apt install --yes sudo
345356
- name: install all dependencies
346-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
357+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet8
347358

348359
# workaround for https://github.com/actions/runner/issues/2033
349360
- name: ownership workaround
@@ -369,9 +380,12 @@ jobs:
369380
370381
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
371382
383+
# fsxc was built with .NET6.x
384+
export DOTNET_ROLL_FORWARD=major
385+
372386
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
373387
374-
linux24-vanilla--stockdotnet6-and-newmono:
388+
linux24-vanilla--stockdotnet-and-newmono:
375389
runs-on: ubuntu-24.04
376390
container:
377391
image: "ubuntu:24.04"
@@ -384,7 +398,7 @@ jobs:
384398
- name: install sudo
385399
run: apt update && apt install --yes sudo
386400
- name: install all dependencies
387-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
401+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet8
388402
- name: install last version of mono (Microsoft APT repositories)
389403
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
390404

@@ -412,9 +426,12 @@ jobs:
412426
413427
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
414428
429+
# fsxc was built with .NET6.x
430+
export DOTNET_ROLL_FORWARD=major
431+
415432
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
416433
417-
linux24-vanilla--stockdotnet6-and-stockmono:
434+
linux24-vanilla--stockdotnet-and-stockmono:
418435
runs-on: ubuntu-24.04
419436
container:
420437
image: "ubuntu:24.04"
@@ -427,7 +444,7 @@ jobs:
427444
- name: install sudo
428445
run: apt update && apt install --yes sudo
429446
- name: install all dependencies
430-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6 mono-xbuild fsharp
447+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet8 mono-xbuild fsharp
431448
- name: install GTK libs (dependency of GTK frontend)
432449
run: sudo apt install --yes libgtk2.0-cil-dev
433450
# workaround for https://github.com/actions/runner/issues/2033
@@ -454,6 +471,9 @@ jobs:
454471
455472
dotnet tool install fsxc --version ${{ env.FSXC_VERSION }}
456473
474+
# fsxc was built with .NET6.x
475+
export DOTNET_ROLL_FORWARD=major
476+
457477
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
458478
459479
linux24-vanilla--newmono-only:
@@ -477,7 +497,7 @@ jobs:
477497
- name: ownership workaround
478498
run: git config --global --add safe.directory '*'
479499

480-
- name: check mono version
500+
- name: check runtime version(s)
481501
run: mono --version
482502
- name: install GTK libs (dependency of GTK frontend)
483503
run: sudo apt install --yes libgtk2.0-cil-dev
@@ -504,9 +524,9 @@ jobs:
504524
with:
505525
submodules: false
506526
- name: install missing dependencies
507-
run: sudo apt install --yes fsharp nunit-console
508-
- name: check mono version
509-
run: mono --version
527+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
528+
- name: check runtime version(s)
529+
run: mono --version; dotnet --version
510530
- name: configure
511531
run: ./configure.sh
512532
- name: build in DEBUG mode
@@ -533,14 +553,12 @@ jobs:
533553
runs-on: ubuntu-22.04
534554
steps:
535555
- uses: actions/checkout@v1
536-
with:
537-
submodules: false
538556
- name: install missing dependencies
539-
run: sudo apt install --yes fsharp nunit-console
557+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
540558
- name: install last version of mono (Microsoft APT repositories)
541559
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
542-
- name: check mono version
543-
run: mono --version
560+
- name: check runtime version(s)
561+
run: mono --version; dotnet --version
544562
- name: install GTK libs (dependency of GTK frontend)
545563
run: sudo apt install --yes libgtk2.0-cil-dev
546564
- name: configure
@@ -589,7 +607,7 @@ jobs:
589607
- name: ownership workaround
590608
run: git config --global --add safe.directory '*'
591609

592-
- name: check mono version
610+
- name: check runtime version(s)
593611
run: mono --version
594612
- name: configure
595613
run: ./configure.sh
@@ -606,7 +624,7 @@ jobs:
606624
- name: integration tests
607625
run: make update-servers
608626

609-
linux22-vanilla--stockdotnet6-only:
627+
linux22-vanilla--stockdotnet-only:
610628
runs-on: ubuntu-22.04
611629
container:
612630
image: "ubuntu:22.04"
@@ -647,7 +665,7 @@ jobs:
647665
648666
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
649667
650-
linux22-vanilla--stockdotnet6-and-newmono:
668+
linux22-vanilla--stockdotnet-and-newmono:
651669
runs-on: ubuntu-22.04
652670
container:
653671
image: "ubuntu:22.04"
@@ -690,7 +708,7 @@ jobs:
690708
691709
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
692710
693-
linux22-vanilla--stockdotnet6-and-stockmono:
711+
linux22-vanilla--stockdotnet-and-stockmono:
694712
runs-on: ubuntu-22.04
695713
container:
696714
image: "ubuntu:22.04"
@@ -753,7 +771,7 @@ jobs:
753771
- name: ownership workaround
754772
run: git config --global --add safe.directory '*'
755773

756-
- name: check mono version
774+
- name: check runtime version(s)
757775
run: mono --version
758776
- name: install GTK libs (dependency of GTK frontend)
759777
run: sudo apt install --yes libgtk2.0-cil-dev
@@ -782,22 +800,19 @@ jobs:
782800
- linux24-github--dotnet-and-newmono
783801
- linux24-vanilla--stockmono-only
784802
- linux24-vanilla--newmono-only
785-
- linux24-vanilla--stockdotnet6-only
786-
- linux24-vanilla--stockdotnet6-and-stockmono
787-
- linux24-vanilla--stockdotnet6-and-newmono
803+
- linux24-vanilla--stockdotnet-only
804+
- linux24-vanilla--stockdotnet-and-stockmono
805+
- linux24-vanilla--stockdotnet-and-newmono
788806
- linux22-github--dotnet-and-mono
789807
- linux22-github--dotnet-and-newmono
790808
- linux22-vanilla--stockmono-only
791809
- 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
810+
- windows--dotnet-and-legacyFramework
796811
- windows--legacyFramework-only
797-
- windows--dotnet6-only
798-
- macOS--dotnet6-and-mono
812+
- windows--dotnet-only
813+
- macOS--dotnet-and-mono
799814
- macOS--mono-only
800-
- macOS--dotnet6-only
815+
- macOS--dotnet-only
801816

802817
steps:
803818
- uses: actions/checkout@v1
@@ -808,7 +823,7 @@ jobs:
808823
which sudo 2>/dev/null || (apt update && apt install --yes sudo)
809824
sudo apt update
810825
811-
sudo apt install --yes git npm curl
826+
sudo DEBIAN_FRONTEND=noninteractive apt install --yes git npm curl
812827
sudo npm install --global n
813828
sudo n lts
814829
# workaround for https://github.com/actions/runner/issues/2033
@@ -857,7 +872,7 @@ jobs:
857872
- name: Test snap
858873
run: geewallet --version
859874

860-
- uses: actions/upload-artifact@v3
875+
- uses: actions/upload-artifact@v4
861876
name: Upload snap package as artifact
862877
with:
863878
name: snap

0 commit comments

Comments
 (0)