Test CI with unified apt source format

dotnet · Jun 20, 2024 · 903ec30 · 903ec30
1 parent 0ca583b
commit 903ec30
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/src/azurelinux/3.0/net8.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net8.0/crossdeps-builder/amd64/Dockerfile
@@ -78,4 +78,4 @@ RUN mkdir llvm-project.src && \
 
 # Obtain arcade scripts used to build rootfs
 RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
-    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
+    git clone --depth 1 --branch feature/build-rootfs-freestanding --single-branch https://github.com/am11/arcade /scripts
diff --git a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile
@@ -78,4 +78,4 @@ RUN mkdir llvm-project.src && \
 
 # Obtain arcade scripts used to build rootfs
 RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
-    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
+    git clone --depth 1 --branch feature/build-rootfs-freestanding --single-branch https://github.com/am11/arcade /scripts
diff --git a/src/cbl-mariner/2.0/crossdeps-builder/amd64/Dockerfile b/src/cbl-mariner/2.0/crossdeps-builder/amd64/Dockerfile
@@ -78,5 +78,4 @@ RUN mkdir llvm-project.src && \
 
 # Obtain arcade scripts used to build rootfs
 RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
-    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
-
+    git clone --depth 1 --branch feature/build-rootfs-freestanding --single-branch https://github.com/am11/arcade /scripts
diff --git a/src/raspbian/10/helix/arm32v6/Dockerfile b/src/raspbian/10/helix/arm32v6/Dockerfile
@@ -4,7 +4,7 @@ ARG ROOTFS_DIR=/crossrootfs
 
 # Obtain arcade scripts used to build rootfs
 RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
-    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
+    git clone --depth 1 --branch feature/build-rootfs-freestanding --single-branch https://github.com/am11/arcade /scripts
 
 # Build the rootfs
 RUN /scripts/eng/common/cross/build-rootfs.sh armv6 raspbian --skipunmount

diff --git a/src/ubuntu/20.04/cross/arm64/Dockerfile b/src/ubuntu/20.04/cross/arm64/Dockerfile
@@ -12,7 +12,7 @@ ARG ROOTFS_DIR=/crossrootfs/arm64
 
 # Build rootfs
 RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
-    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
+    git clone --depth 1 --branch feature/build-rootfs-freestanding --single-branch https://github.com/am11/arcade /scripts
 RUN /scripts/eng/common/cross/build-rootfs.sh arm64 xenial lldb3.9 --skipunmount
 RUN bash -c "rm -rf $ROOTFS_DIR/*/{var/cache/apt/archives/*,var/lib/apt/lists/*,usr/share/doc,usr/share/man}"
 

diff --git a/src/ubuntu/20.04/crossdeps/Dockerfile b/src/ubuntu/20.04/crossdeps/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update \
         flex \
         gdb \
         make \
+        nano \
         qemu \
         qemu-user-static \
         rpm2cpio \
@@ -43,4 +44,3 @@ RUN apt-get update \
         llvm-9 \
         python-lldb-6.0 \
     && rm -rf /var/lib/apt/lists/*
-
diff --git a/src/ubuntu/22.04/cross/arm/Dockerfile b/src/ubuntu/22.04/cross/arm/Dockerfile
@@ -1,9 +1,9 @@
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps-local AS builder
 ARG ROOTFS_DIR=/crossrootfs/arm
 
-# Obtain arcade scripts used to build rootfs
+# Obtain arcade scripts used to build  rootfs
 RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
-    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
+    git clone --depth 1 --branch feature/build-rootfs-freestanding --single-branch https://github.com/am11/arcade /scripts
 
 # Build the rootfs
 RUN /scripts/eng/common/cross/build-rootfs.sh arm jammy lldb14 --skipunmount

diff --git a/src/ubuntu/22.04/cross/arm64/Dockerfile b/src/ubuntu/22.04/cross/arm64/Dockerfile
@@ -3,7 +3,7 @@ ARG ROOTFS_DIR=/crossrootfs/arm64
 
 # Obtain arcade scripts used to build rootfs
 RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
-    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
+    git clone --depth 1 --branch feature/build-rootfs-freestanding --single-branch https://github.com/am11/arcade /scripts
 
 # Build the rootfs
 RUN /scripts/eng/common/cross/build-rootfs.sh arm xenial lldb3.9 --skipunmount

diff --git a/src/ubuntu/22.04/cross/armel-tizen/Dockerfile b/src/ubuntu/22.04/cross/armel-tizen/Dockerfile
@@ -3,7 +3,7 @@ ARG ROOTFS_DIR=/crossrootfs/armel
 
 # Obtain arcade scripts used to build rootfs
 RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
-    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
+    git clone --depth 1 --branch feature/build-rootfs-freestanding --single-branch https://github.com/am11/arcade /scripts
 
 RUN /scripts/eng/common/cross/tizen-build-rootfs.sh armel