Skip to content

Commit 2247839

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 55b9fe0 commit 2247839

File tree

1 file changed

+18
-62
lines changed

1 file changed

+18
-62
lines changed

.github/workflows/ci.yml

+18-62
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,16 @@ jobs:
1515
matrix:
1616
container_image:
1717
- quay.io/centos/centos:stream9
18-
- quay.io/centos/centos:stream10-development
19-
- registry.fedoraproject.org/fedora:39
18+
- quay.io/centos/centos:stream10
2019
- registry.fedoraproject.org/fedora:40
20+
- registry.fedoraproject.org/fedora:41
2121
- registry.fedoraproject.org/fedora:rawhide
2222
- registry.access.redhat.com/ubi8
2323
- registry.access.redhat.com/ubi9
2424
dotnet_version:
25-
- "6.0"
2625
- "8.0"
27-
exclude:
28-
- container_image: registry.fedoraproject.org/fedora:rawhide
29-
dotnet_version: "6.0"
30-
- container_image: quay.io/centos/centos:stream10-development
31-
dotnet_version: "6.0"
32-
include:
33-
- container_image: registry.fedoraproject.org/fedora:40
34-
dotnet_version: "9.0"
35-
- container_image: registry.fedoraproject.org/fedora:rawhide
36-
dotnet_version: "9.0"
37-
- container_image: quay.io/centos/centos:stream10-development
38-
dotnet_version: "9.0"
26+
- "9.0"
3927

40-
4128
container:
4229
image: ${{ matrix.container_image }}
4330
options: --security-opt seccomp=unconfined
@@ -47,22 +34,13 @@ jobs:
4734
timeout-minutes: 5
4835
run: |
4936
set -euo pipefail
50-
if [[ ${{ matrix.dotnet_version }} == 9.* ]]; then
51-
dnf install 'dnf-command(copr)' -y
52-
cat /etc/os-release
53-
if grep centos /etc/os-release ; then
54-
dnf copr enable @dotnet-sig/dotnet-preview centos-stream-10-x86_64 -y
55-
else
56-
dnf copr enable @dotnet-sig/dotnet-preview -y
57-
fi
58-
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
59-
fi
6037
dnf install -y dotnet-sdk-${{ matrix.dotnet_version }} git make
61-
if [[ ! ${{ matrix.dotnet_version }} == *6* ]]; then
62-
dnf install -y \
63-
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
64-
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
65-
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
38+
dnf install -y \
39+
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
40+
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
41+
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
42+
if [ ${{ matrix.dotnet_version }} >= 9.* ]; then
43+
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
6644
fi
6745
6846
- uses: actions/checkout@v2
@@ -99,28 +77,15 @@ jobs:
9977
matrix:
10078
container_image:
10179
- quay.io/centos/centos:stream9
102-
- quay.io/centos/centos:stream10-development
103-
- registry.fedoraproject.org/fedora:39
80+
- quay.io/centos/centos:stream10
10481
- registry.fedoraproject.org/fedora:40
82+
- registry.fedoraproject.org/fedora:41
10583
- registry.fedoraproject.org/fedora:rawhide
10684
- registry.access.redhat.com/ubi8
10785
- registry.access.redhat.com/ubi9
10886
dotnet_version:
109-
- "6.0"
11087
- "8.0"
111-
exclude:
112-
- container_image: registry.fedoraproject.org/fedora:rawhide
113-
dotnet_version: "6.0"
114-
- container_image: quay.io/centos/centos:stream10-development
115-
dotnet_version: "6.0"
116-
include:
117-
- container_image: registry.fedoraproject.org/fedora:40
118-
dotnet_version: "9.0"
119-
- container_image: registry.fedoraproject.org/fedora:rawhide
120-
dotnet_version: "9.0"
121-
- container_image: quay.io/centos/centos:stream10-development
122-
dotnet_version: "9.0"
123-
88+
- "9.0"
12489

12590
container:
12691
image: ${{ matrix.container_image }}
@@ -131,22 +96,13 @@ jobs:
13196
timeout-minutes: 5
13297
run: |
13398
set -euo pipefail
134-
if [[ ${{ matrix.dotnet_version }} == 9.* ]]; then
135-
dnf install 'dnf-command(copr)' -y
136-
cat /etc/os-release
137-
if grep centos /etc/os-release ; then
138-
dnf copr enable @dotnet-sig/dotnet-preview centos-stream-10-x86_64 -y
139-
else
140-
dnf copr enable @dotnet-sig/dotnet-preview -y
141-
fi
142-
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
143-
fi
14499
dnf install -y dotnet-sdk-${{ matrix.dotnet_version }} git make
145-
if [[ ! ${{ matrix.dotnet_version }} == *6* ]]; then
146-
dnf install -y \
147-
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
148-
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
149-
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
100+
dnf install -y \
101+
dotnet-sdk-dbg-${{ matrix.dotnet_version }} \
102+
dotnet-runtime-dbg-${{ matrix.dotnet_version }} \
103+
aspnetcore-runtime-dbg-${{ matrix.dotnet_version }}
104+
if [ ${{ matrix.dotnet_version }} >= 9.* ]; then
105+
dnf install -y dotnet-sdk-aot-${{ matrix.dotnet_version }}
150106
fi
151107
152108
# We need to fetch the tags, so 'git tag' in 'make publish' below works

0 commit comments

Comments
 (0)