Merge remote-tracking branch 'origin/main' into mg/squashfsallthethings

compiler-explorer · Dec 12, 2024 · 6e1e9ab · 6e1e9ab
2 parents 0e6b001 + d8a077c
commit 6e1e9ab
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 9 deletions.
diff --git a/bin/yaml/cpp.yaml b/bin/yaml/cpp.yaml
@@ -53,21 +53,37 @@ compilers:
           - 10.1.0
           - 10.2.0
           - 10.3.0
+          - assertions-10.3.0
           - 10.4.0
+          - assertions-10.4.0
           - 10.5.0
+          - assertions-10.5.0
           - 11.1.0
+          - assertions-11.1.0
           - 11.2.0
+          - assertions-11.2.0
           - 11.3.0
+          - assertions-11.3.0
           - 11.4.0
+          - assertions-11.4.0
           - 12.1.0
+          - assertions-12.1.0
           - 12.2.0
+          - assertions-12.2.0
           - 12.3.0
+          - assertions-12.3.0
           - 12.4.0
+          - assertions-12.4.0
           - 13.1.0
+          - assertions-13.1.0
           - 13.2.0
+          - assertions-13.2.0
           - 13.3.0
+          - assertions-13.3.0
           - 14.1.0
+          - assertions-14.1.0
           - 14.2.0
+          - assertions-14.2.0
     cross:
       type: s3tarballs
       arch_prefix:
@@ -1376,6 +1392,7 @@ compilers:
           - dascandy-contracts-trunk
           - p1974-trunk
           - ericwf-contracts-trunk
+          - chrisbazley-trunk
           - name: llvmflang-trunk
             check_exe: bin/flang --version
       mlir:

diff --git a/bin/yaml/ygen.yaml b/bin/yaml/ygen.yaml
@@ -12,4 +12,5 @@ compilers:
       check_exe: bin/ylc --version
 
       targets:
-        - newest
+          # https://github.com/compiler-explorer/infra/issues/1481
+          #- newest
diff --git a/setup-admin.sh b/setup-admin.sh
@@ -15,10 +15,22 @@ fi
 env EXTRA_NFS_ARGS="" INSTALL_TYPE="admin" "${DIR}/setup-common.sh"
 
 apt -y install \
-  mosh fish jq cronic subversion upx gdb autojump \
-  zlib1g-dev m4 \
-  python3 python3-venv python3.8 python3.8-venv libc6-dev-i386 \
-  squashfs-tools-ng
+  autojump \
+  cronic \
+  fish \
+  gdb \
+  jq \
+  libc6-dev-i386 \
+  m4 \
+  mosh \
+  python3 \
+  python3-venv \
+  python3.8 \
+  python3.8-venv \
+  squashfs-tools-ng \
+  subversion \
+  upx \
+  zlib1g-dev
 chsh ubuntu -s /usr/bin/fish
 
 cd /home/ubuntu/infra

diff --git a/setup-common.sh b/setup-common.sh
@@ -48,7 +48,6 @@ hash -r pip
 # This returns amd64 or arm64
 ARCH=$(dpkg --print-architecture)
 
-
 if [ "$INSTALL_TYPE" != 'ci' ]; then
   mkdir /tmp/aws-install
   pushd /tmp/aws-install
@@ -189,3 +188,11 @@ aws s3 sync s3://compiler-explorer/authorized_keys /tmp/auth_keys
 cat /tmp/auth_keys/* >>/home/ubuntu/.ssh/authorized_keys
 rm -rf /tmp/auth_keys
 chown -R ubuntu /home/ubuntu/.ssh
+
+setup_cefs() {
+    mkdir /cefs
+    echo "* -fstype=squashfs,loop,nosuid,nodev,ro :/efs/cefs-images/&.sqfs" > /etc/auto.cefs
+    echo "/cefs /etc/auto.cefs --negative-timeout 1" > /etc/auto.master.d/cefs.autofs
+    service autofs restart
+}
+setup_cefs
diff --git a/terraform/lc.tf b/terraform/lc.tf
@@ -1,7 +1,7 @@
 locals {
-  image_id                 = "ami-01f6b885ccb15ff4c"
-  staging_image_id         = "ami-01f6b885ccb15ff4c"
-  beta_image_id            = "ami-01f6b885ccb15ff4c"
+  image_id                 = "ami-0cfaa1f31737d26b4"
+  staging_image_id         = "ami-0475858af6bc5f3c9"
+  beta_image_id            = "ami-0cfaa1f31737d26b4"
   gpu_image_id             = "ami-0e49c31db87fb4332"
   aarch64prod_image_id     = "ami-0940f416984ac4e8b"
   aarch64staging_image_id  = "ami-0940f416984ac4e8b"