From 3e99d010c073653c343ba242ea157ac9e31a616b Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Sun, 5 Jan 2025 13:30:40 +0200 Subject: [PATCH 1/3] Revert "Dummy change to retrigger the new arch build (#1309)" This reverts commit 23bf68c28e14e548add6aaaafe663157f43de42e. --- src/azurelinux/3.0/net10.0/cross/loongarch64-musl/Dockerfile | 2 -- src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile | 2 -- src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile | 1 - 3 files changed, 5 deletions(-) diff --git a/src/azurelinux/3.0/net10.0/cross/loongarch64-musl/Dockerfile b/src/azurelinux/3.0/net10.0/cross/loongarch64-musl/Dockerfile index df14f5e1e..0b07531fb 100644 --- a/src/azurelinux/3.0/net10.0/cross/loongarch64-musl/Dockerfile +++ b/src/azurelinux/3.0/net10.0/cross/loongarch64-musl/Dockerfile @@ -1,7 +1,5 @@ ARG ROOTFS_DIR=/crossrootfs/loongarch64 -# dummy change to retrigger build - FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder ARG ROOTFS_DIR diff --git a/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile index fa954a3c1..09625fd62 100644 --- a/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile +++ b/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile @@ -1,7 +1,5 @@ ARG ROOTFS_DIR=/crossrootfs/loongarch64 -# dummy change to retrigger build - FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder ARG ROOTFS_DIR diff --git a/src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile index 51d0cc95a..cabb8adad 100644 --- a/src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile +++ b/src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile @@ -2,6 +2,5 @@ FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdep FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-amd64 -# dummy change to retrigger the build for new architecture added in crossdeps-builder # Install LLVM that we built from source COPY --from=builder /usr/local /usr/local From f5c9d60411b06ea559126a5a06bf677c7b84973d Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Sun, 5 Jan 2025 13:32:29 +0200 Subject: [PATCH 2/3] Apply arcade 15374 --- src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile index 09625fd62..04dc7ba20 100644 --- a/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile +++ b/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile @@ -3,6 +3,9 @@ ARG ROOTFS_DIR=/crossrootfs/loongarch64 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder ARG ROOTFS_DIR +# temp +RUN rm -rf /scripts && git clone https://github.com/dotnet/arcade --single-branch --depth 1 -b akoeplinger-patch-1 /scripts + RUN rootfsEnv="/usr/local/share/rootfs" && \ python3 -m venv "$rootfsEnv" && \ "$rootfsEnv/bin/python" -m pip install aiohttp zstandard && \ From 877068c39ba3333a396216d1f6a83fc7dc3aedc9 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Sun, 5 Jan 2025 14:32:56 +0200 Subject: [PATCH 3/3] Revert temp change --- src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile index 04dc7ba20..09625fd62 100644 --- a/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile +++ b/src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile @@ -3,9 +3,6 @@ ARG ROOTFS_DIR=/crossrootfs/loongarch64 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder ARG ROOTFS_DIR -# temp -RUN rm -rf /scripts && git clone https://github.com/dotnet/arcade --single-branch --depth 1 -b akoeplinger-patch-1 /scripts - RUN rootfsEnv="/usr/local/share/rootfs" && \ python3 -m venv "$rootfsEnv" && \ "$rootfsEnv/bin/python" -m pip install aiohttp zstandard && \