Skip to content

Commit 636fdd5

Browse files
committed
Update ci matrix and .NET installation instructions.
Adding Fedora41 to the CI matrix while also removing Fedora39. .NET 6 has also been removed. The installation steps for .NET 9 have been updated now that it has been publically released.
1 parent 26cdb2d commit 636fdd5

File tree

1 file changed

+19
-36
lines changed

1 file changed

+19
-36
lines changed

.github/workflows/ci.yml

+19-36
Original file line numberDiff line numberDiff line change
@@ -21,73 +21,56 @@ jobs:
2121
- docker.io/library/alpine:latest
2222
- docker.io/library/alpine:edge
2323
- quay.io/centos/centos:stream9
24-
- quay.io/centos/centos:stream10-development
25-
- registry.fedoraproject.org/fedora:39
24+
- quay.io/centos/centos:stream10
2625
- registry.fedoraproject.org/fedora:40
26+
- registry.fedoraproject.org/fedora:41
2727
- registry.fedoraproject.org/fedora:rawhide
2828
- registry.access.redhat.com/ubi8
2929
- registry.access.redhat.com/ubi9
3030
dotnet_version:
31-
- "6.0"
3231
- "8.0"
32+
- "9.0"
3333
exclude:
34-
- container_image: registry.fedoraproject.org/fedora:rawhide
35-
dotnet_version: "6.0"
36-
- container_image: quay.io/centos/centos:stream10-development
37-
dotnet_version: "6.0"
38-
include:
39-
- container_image: registry.fedoraproject.org/fedora:40
34+
- container_image: docker.io/library/alpine:latest
4035
dotnet_version: "9.0"
41-
- container_image: registry.fedoraproject.org/fedora:rawhide
42-
dotnet_version: "9.0"
43-
- container_image: quay.io/centos/centos:stream10-development
36+
- container_image: docker.io/library/alpine:edge
4437
dotnet_version: "9.0"
4538

4639
container:
4740
image: ${{ matrix.container_image }}
4841
options: --security-opt seccomp=unconfined
4942

50-
5143
steps:
5244
- uses: actions/checkout@v4
5345

5446
- name: Install .NET ${{ matrix.dotnet_version }}
55-
# .NET 9 is a preview and requires 'copr' for installation.
5647
# .NET 9 introduced the 'dotnet-sdk-aot' package
5748
# .NET 8 introduced the 'dbg' packages
5849
# '/etc/os-release' will also match the grep fedora for Fedora derived systems, such as CentOS.
5950
timeout-minutes: 10
6051
run: |
61-
6252
set -euo pipefail
6353
cat /etc/os-release
64-
if [[ ${{ matrix.dotnet_version }} == 9.* ]]; then
65-
dnf install 'dnf-command(copr)' -y
66-
if grep centos /etc/os-release; then
67-
dnf copr enable @dotnet-sig/dotnet-preview centos-stream-10-x86_64 -y
68-
else
69-
dnf copr enable @dotnet-sig/dotnet-preview -y
70-
fi
71-
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
72-
fi
7354
if grep fedora /etc/os-release; then
7455
dnf install -y dotnet-sdk-${{ matrix.dotnet_version }}
75-
if [[ ! ${{ matrix.dotnet_version }} == *6* ]]; then
76-
dnf install -y \
77-
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
78-
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
79-
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
80-
fi
56+
dnf install -y \
57+
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
58+
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
59+
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
60+
if ${{ matrix.dotnet_version }} == 9.* ; then
61+
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
62+
fi
8163
elif grep alpine /etc/os-release; then
8264
if grep edge /etc/os-release; then
8365
echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
8466
fi
8567
apk add dotnet-sdk-${{ matrix.dotnet_version }} dotnet-doc
86-
if [[ ! ${{ matrix.dotnet_version }} == *6* ]]; then
87-
apk add \
88-
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
89-
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
90-
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
68+
apk add \
69+
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
70+
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
71+
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
72+
if [ ${{ matrix.dotnet_version }} >= 9.* ]; then
73+
apk add dotnet-sdk-aot-${{ matrix.dotnet_version }}
9174
fi
9275
fi
9376
@@ -138,4 +121,4 @@ jobs:
138121
if: ${{ always() }}
139122
run: |
140123
set -euo pipefail
141-
find -iname '*.log' -exec echo {} \; -exec cat {} \;
124+
find -iname '*.log' -exec echo {} \; -exec cat {} \;

0 commit comments

Comments
 (0)