Skip to content

Commit 425240b

Browse files
anup-kodlekerekodlean
anup-kodlekere
and
kodlean
authored
Additional changes that builds off of nealef's PR #15 (#17)
Co-authored-by: anup-kodlekere <anup_kodlekere@persistent.com>
1 parent 844c5d1 commit 425240b

7 files changed

+36
-74
lines changed

‎Dockerfile.almalinux

+1-8
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,9 @@ RUN cd /tmp && \
1414
git clone -q ${RUNNERREPO} && \
1515
cd runner && \
1616
git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) -b build && \
17+
sed -i'' -e /version/s/6......\"$/${SDK}.0.100\"/ src/global.json && \
1718
git apply /tmp/runner.patch
1819

19-
RUN if [ "${SDK}" -ne 6 ]; then \
20-
cd /usr/lib64/dotnet/packs; \
21-
ln -s Microsoft.AspNetCore.App.Ref Microsoft.AspNetCore.App.Runtime.linux-${ARCH}; \
22-
ln -s Microsoft.AspNetCore.App.Ref Microsoft.AspNetCore.App.linux-${ARCH}; \
23-
ln -s Microsoft.NETCore.App.Host.rhel.9-${ARCH} Microsoft.NETCore.App.Host.linux-${ARCH}; \
24-
ln -s Microsoft.NETCore.App.Ref Microsoft.NETCore.App.Runtime.linux-${ARCH}; \
25-
fi
26-
2720
RUN cd /tmp/runner/src && \
2821
./dev.sh layout && \
2922
./dev.sh package && \

‎Dockerfile.opensuse

+2-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG RUNNERREPO="https://github.com/actions/runner" SDK RUNNERPATCH ARCH
44

55
RUN zypper dup -y && \
66
zypper update -y && \
7-
zypper install -y wget git which libicu73 gawk sudo
7+
zypper install -y wget git which libicu75 gawk sudo findutils
88

99
COPY build-files/convert-rpm.sh /tmp
1010

@@ -20,16 +20,9 @@ RUN cd /tmp && \
2020
git clone -q ${RUNNERREPO} && \
2121
cd runner && \
2222
git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) -b build && \
23+
sed -i'' -e /version/s/6......\"$/${SDK}.0.100\"/ src/global.json && \
2324
git apply /tmp/runner.patch
2425

25-
RUN if [ "${SDK}" -ne 6 ]; then \
26-
cd /usr/lib64/dotnet/packs; \
27-
ln -s Microsoft.AspNetCore.App.Ref Microsoft.AspNetCore.App.Runtime.linux-${ARCH}; \
28-
ln -s Microsoft.AspNetCore.App.Ref Microsoft.AspNetCore.App.linux-${ARCH}; \
29-
ln -s Microsoft.NETCore.App.Host.rhel.9-${ARCH} Microsoft.NETCore.App.Host.linux-${ARCH}; \
30-
ln -s Microsoft.NETCore.App.Ref Microsoft.NETCore.App.Runtime.linux-${ARCH}; \
31-
fi
32-
3326
RUN cd /tmp/runner/src && \
3427
./dev.sh layout && \
3528
./dev.sh package && \

‎Dockerfile.ubuntu

+2-9
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@ RUN cd /tmp && \
2222
git clone -q ${RUNNERREPO} && \
2323
cd runner && \
2424
git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) -b build && \
25-
git apply /tmp/runner.patch
26-
27-
RUN if [ "${SDK}" -ne 6 ]; then \
28-
cd /usr/lib64/dotnet/packs; \
29-
ln -s Microsoft.AspNetCore.App.Ref Microsoft.AspNetCore.App.Runtime.linux-${ARCH}; \
30-
ln -s Microsoft.AspNetCore.App.Ref Microsoft.AspNetCore.App.linux-${ARCH}; \
31-
ln -s Microsoft.NETCore.App.Host.rhel.9-${ARCH} Microsoft.NETCore.App.Host.linux-${ARCH}; \
32-
ln -s Microsoft.NETCore.App.Ref Microsoft.NETCore.App.Runtime.linux-${ARCH}; \
33-
fi
25+
sed -i'' -e /version/s/6......\"$/${SDK}.0.100\"/ src/global.json && \
26+
git apply /tmp/runner.patch
3427

3528
RUN cd /tmp/runner/src && \
3629
./dev.sh layout && \

‎build-files/build-image.sh

+13-11
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,29 @@ update_fresh_container() {
1717
}
1818

1919
setup_dotnet_sdk() {
20-
MIRROR="https://mirror.lchs.network/pub/almalinux/9.3/AppStream/${ARCH}/os/Packages"
20+
MIRROR="https://mirror.lchs.network/pub/almalinux/9/AppStream/${ARCH}/os/Packages"
2121
case "${SDK}" in
2222
7)
23-
PKGS="dotnet-apphost-pack-7.0-7.0.15-1.el9_3 dotnet-host-8.0.1-1.el9_3"
24-
PKGS="${PKGS} dotnet-hostfxr-7.0-7.0.15-1.el9_3 dotnet-targeting-pack-7.0-7.0.15-1.el9_3"
25-
PKGS="${PKGS} dotnet-templates-7.0-7.0.115-1.el9_3 dotnet-runtime-7.0-7.0.15-1.el9_3"
26-
PKGS="${PKGS} dotnet-sdk-7.0-7.0.115-1.el9_3 aspnetcore-runtime-7.0-7.0.15-1.el9_3"
27-
PKGS="${PKGS} aspnetcore-targeting-pack-7.0-7.0.15-1.el9_3 netstandard-targeting-pack-2.1-8.0.101-1.el9_3"
23+
PKGS="dotnet-apphost-pack-7.0-7.0.19-1.el9_4 dotnet-host-8.0.5-1.el9_4"
24+
PKGS="${PKGS} dotnet-hostfxr-7.0-7.0.19-1.el9_4 dotnet-targeting-pack-7.0-7.0.19-1.el9_4"
25+
PKGS="${PKGS} dotnet-templates-7.0-7.0.119-1.el9_4 dotnet-runtime-7.0-7.0.19-1.el9_4"
26+
PKGS="${PKGS} dotnet-sdk-7.0-7.0.119-1.el9_4 aspnetcore-runtime-7.0-7.0.19-1.el9_4"
27+
PKGS="${PKGS} aspnetcore-targeting-pack-7.0-7.0.19-1.el9_4 netstandard-targeting-pack-2.1-8.0.105-1.el9_4"
2828
;;
2929
6)
30-
PKGS="dotnet-host-8.0.1-1.el9_3 dotnet-apphost-pack-6.0-6.0.26-1.el9_3"
31-
PKGS="${PKGS} dotnet-hostfxr-6.0-6.0.26-1.el9_3 dotnet-targeting-pack-6.0-6.0.26-1.el9_3"
32-
PKGS="${PKGS} dotnet-templates-6.0-6.0.126-1.el9_3 dotnet-runtime-6.0-6.0.26-1.el9_3"
33-
PKGS="${PKGS} dotnet-sdk-6.0-6.0.126-1.el9_3 aspnetcore-runtime-6.0-6.0.26-1.el9_3"
34-
PKGS="${PKGS} aspnetcore-targeting-pack-6.0-6.0.26-1.el9_3 netstandard-targeting-pack-2.1-8.0.101-1.el9_3"
30+
PKGS="dotnet-host-8.0.5-1.el9_4 dotnet-apphost-pack-6.0-6.0.30-1.el9_4"
31+
PKGS="${PKGS} dotnet-hostfxr-6.0-6.0.30-1.el9_4 dotnet-targeting-pack-6.0-6.0.30-1.el9_4"
32+
PKGS="${PKGS} dotnet-templates-6.0-6.0.130-1.el9_4 dotnet-runtime-6.0-6.0.30-1.el9_4"
33+
PKGS="${PKGS} dotnet-sdk-6.0-6.0.130-1.el9_4 aspnetcore-runtime-6.0-6.0.30-1.el9_4"
34+
PKGS="${PKGS} aspnetcore-targeting-pack-6.0-6.0.30-1.el9_4 netstandard-targeting-pack-2.1-8.0.105-1.el9_4"
3535
;;
3636
*)
3737
echo "Unsupported architecture ${ARCH}" >&2
3838
return 1
3939
;;
4040
esac
4141
echo "Retrieving dotnet packages"
42+
sudo sed -i'' -e 's/--no-absolute-filenames//' /usr/share/perl5/Alien/Package/Rpm.pm
4243
pushd /tmp >/dev/null
4344
for pkg in ${PKGS}
4445
do
@@ -87,6 +88,7 @@ patch_runner() {
8788
cd runner
8889
git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) -b ${ARCH}
8990
git apply /home/ubuntu/runner-${ARCH}.patch
91+
sed -i'' -e /version/s/6......\"$/${SDK}.0.100\"/ src/global.json
9092
return $?
9193
}
9294

‎build-files/convert-rpm.sh

+18-15
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,41 @@
22
. /etc/os-release
33
SDK=$1
44
ARCH=`uname -m`
5-
MIRROR="https://mirror.lchs.network/pub/almalinux/9.3/AppStream/${ARCH}/os/Packages"
5+
MIRROR="https://mirror.lchs.network/pub/almalinux/9/AppStream/${ARCH}/os/Packages"
66
case "${SDK}" in
77
7)
8-
PKGS="dotnet-apphost-pack-7.0-7.0.15-1.el9_3 dotnet-host-8.0.1-1.el9_3"
9-
PKGS="${PKGS} dotnet-hostfxr-7.0-7.0.15-1.el9_3 dotnet-targeting-pack-7.0-7.0.15-1.el9_3"
10-
PKGS="${PKGS} dotnet-templates-7.0-7.0.115-1.el9_3 dotnet-runtime-7.0-7.0.15-1.el9_3"
11-
PKGS="${PKGS} dotnet-sdk-7.0-7.0.115-1.el9_3 aspnetcore-runtime-7.0-7.0.15-1.el9_3"
12-
PKGS="${PKGS} aspnetcore-targeting-pack-7.0-7.0.15-1.el9_3 netstandard-targeting-pack-2.1-8.0.101-1.el9_3"
8+
PKGS="dotnet-apphost-pack-7.0-7.0.19-1.el9_4 dotnet-host-8.0.5-1.el9_4"
9+
PKGS="${PKGS} dotnet-hostfxr-7.0-7.0.19-1.el9_4 dotnet-targeting-pack-7.0-7.0.19-1.el9_4"
10+
PKGS="${PKGS} dotnet-templates-7.0-7.0.119-1.el9_4 dotnet-runtime-7.0-7.0.19-1.el9_4"
11+
PKGS="${PKGS} dotnet-sdk-7.0-7.0.119-1.el9_4 aspnetcore-runtime-7.0-7.0.19-1.el9_4"
12+
PKGS="${PKGS} aspnetcore-targeting-pack-7.0-7.0.19-1.el9_4 netstandard-targeting-pack-2.1-8.0.105-1.el9_4"
1313
;;
1414
6)
15-
PKGS="dotnet-host-8.0.1-1.el9_3 dotnet-apphost-pack-6.0-6.0.26-1.el9_3"
16-
PKGS="${PKGS} dotnet-hostfxr-6.0-6.0.26-1.el9_3 dotnet-targeting-pack-6.0-6.0.26-1.el9_3"
17-
PKGS="${PKGS} dotnet-templates-6.0-6.0.126-1.el9_3 dotnet-runtime-6.0-6.0.26-1.el9_3"
18-
PKGS="${PKGS} dotnet-sdk-6.0-6.0.126-1.el9_3 aspnetcore-runtime-6.0-6.0.26-1.el9_3"
19-
PKGS="${PKGS} aspnetcore-targeting-pack-6.0-6.0.26-1.el9_3 netstandard-targeting-pack-2.1-8.0.101-1.el9_3"
15+
PKGS="dotnet-host-8.0.5-1.el9_4 dotnet-apphost-pack-6.0-6.0.30-1.el9_4"
16+
PKGS="${PKGS} dotnet-hostfxr-6.0-6.0.30-1.el9_4 dotnet-targeting-pack-6.0-6.0.30-1.el9_4"
17+
PKGS="${PKGS} dotnet-templates-6.0-6.0.130-1.el9_4 dotnet-runtime-6.0-6.0.30-1.el9_4"
18+
PKGS="${PKGS} dotnet-sdk-6.0-6.0.130-1.el9_4 aspnetcore-runtime-6.0-6.0.30-1.el9_4"
19+
PKGS="${PKGS} aspnetcore-targeting-pack-6.0-6.0.30-1.el9_4 netstandard-targeting-pack-2.1-8.0.105-1.el9_4"
2020
;;
2121
*)
22-
echo "Unsupported SDK ${SDK}" >&2
23-
exit 1
22+
echo "Unsupported architecture ${ARCH}" >&2
23+
return 1
2424
;;
2525
esac
2626
echo "Retrieving dotnet packages"
27+
if [ ${ID} = "ubuntu" ]; then
28+
sed -i'' -e 's/--no-absolute-filenames//' /usr/share/perl5/Alien/Package/Rpm.pm
29+
fi
2730
pushd /tmp >/dev/null
2831
for pkg in ${PKGS}
2932
do
3033
RPM="${pkg}.${ARCH}.rpm"
3134
wget -q ${MIRROR}/${RPM}
32-
if [ ${ID} == "ubuntu" ]; then
35+
if [ ${ID} = "ubuntu" ]; then
3336
echo -n "Converting ${RPM}... "
3437
alien -d ${RPM} |& grep -v ^warning
3538
if [ $? -ne 0 ]; then
36-
exit 2
39+
return 2
3740
fi
3841
rm -f ${RPM}
3942
fi

‎build-files/runner-ppc64le.patch

-11
Original file line numberDiff line numberDiff line change
@@ -376,14 +376,3 @@ index 056a312..8370922 100644
376376
<Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
377377
</Target>
378378

379-
diff --git a/src/global.json b/src/global.json
380-
index b014aea..70e3dcc 100644
381-
--- a/src/global.json
382-
+++ b/src/global.json
383-
@@ -1,5 +1,5 @@
384-
{
385-
"sdk": {
386-
- "version": "6.0.419"
387-
+ "version": "7.0.100"
388-
}
389-
}

‎build-files/runner-s390x.patch

-11
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,3 @@ index 056a312..8370922 100644
241241
<Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
242242
</Target>
243243

244-
diff --git a/src/global.json b/src/global.json
245-
index b014aea..70e3dcc 100644
246-
--- a/src/global.json
247-
+++ b/src/global.json
248-
@@ -1,5 +1,5 @@
249-
{
250-
"sdk": {
251-
- "version": "6.0.419"
252-
+ "version": "6.0.126"
253-
}
254-
}

0 commit comments

Comments
 (0)