From bc3516d98458d4417c068d2c595cd2c9c7d1afa9 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Tue, 10 Dec 2024 09:16:07 +0000 Subject: [PATCH 1/8] New AMI --- terraform/lc.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/lc.tf b/terraform/lc.tf index ca1bb95a..f57158f0 100755 --- 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-0cfaa1f31737d26b4" + beta_image_id = "ami-0cfaa1f31737d26b4" gpu_image_id = "ami-0e49c31db87fb4332" aarch64prod_image_id = "ami-0940f416984ac4e8b" aarch64staging_image_id = "ami-0940f416984ac4e8b" From c4843b2b3b2f78262ac985b4b69b725cd4f3adab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= Date: Wed, 11 Dec 2024 13:53:41 +0100 Subject: [PATCH 2/8] Add "assertions" builds for GCC (#1480) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc Poulhiès --- bin/yaml/cpp.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bin/yaml/cpp.yaml b/bin/yaml/cpp.yaml index 379f7640..e700f0f3 100644 --- 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: From 5b5d060b761a75c583a8b2aaf74b9ce5dc9a7441 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Thu, 12 Dec 2024 08:43:54 -0600 Subject: [PATCH 3/8] Add autofs and install cefs configuration (#1479) --- setup-admin.sh | 18 +++++++++++++++++- setup-common.sh | 10 +++++++++- terraform/lc.tf | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/setup-admin.sh b/setup-admin.sh index 4af326d5..93b2e135 100755 --- a/setup-admin.sh +++ b/setup-admin.sh @@ -14,7 +14,23 @@ 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 +apt -y install \ + 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 index 049b9a65..a9f147ef 100755 --- a/setup-common.sh +++ b/setup-common.sh @@ -25,6 +25,7 @@ apt-get -y update apt-get -y dist-upgrade --force-yes apt-get -y install \ + autofs \ jq \ libc6-arm64-cross \ libdatetime-perl \ @@ -46,7 +47,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 @@ -187,3 +187,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 index f57158f0..67288478 100755 --- a/terraform/lc.tf +++ b/terraform/lc.tf @@ -1,6 +1,6 @@ locals { image_id = "ami-0cfaa1f31737d26b4" - staging_image_id = "ami-0cfaa1f31737d26b4" + staging_image_id = "ami-0410d305cc1eac4c1" beta_image_id = "ami-0cfaa1f31737d26b4" gpu_image_id = "ami-0e49c31db87fb4332" aarch64prod_image_id = "ami-0940f416984ac4e8b" From db1c4e9adddd0c00ce805830ec93807a2073abe6 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Thu, 12 Dec 2024 14:55:58 +0000 Subject: [PATCH 4/8] Add @chrisbazley's fork of clang to the daily installs --- bin/yaml/cpp.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/yaml/cpp.yaml b/bin/yaml/cpp.yaml index e700f0f3..a1abcb28 100644 --- a/bin/yaml/cpp.yaml +++ b/bin/yaml/cpp.yaml @@ -1392,6 +1392,7 @@ compilers: - dascandy-contracts-trunk - p1974-trunk - ericwf-contracts-trunk + - chrisbazley-trunk - name: llvmflang-trunk check_exe: bin/flang --version mlir: From b47fc4449792d596eb01757fd65b90966b946703 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Thu, 12 Dec 2024 15:07:49 +0000 Subject: [PATCH 5/8] Remove ygen daily install after it broke, cc #1481 --- bin/yaml/ygen.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/yaml/ygen.yaml b/bin/yaml/ygen.yaml index 1cdb96b4..6cca29c8 100644 --- 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 From b37c5b42b5071add3a6d06529e57317849771663 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Thu, 12 Dec 2024 20:11:01 +0500 Subject: [PATCH 6/8] Add latest odin release (#1477) --- bin/yaml/odin.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bin/yaml/odin.yaml b/bin/yaml/odin.yaml index 5355042d..8c472326 100644 --- a/bin/yaml/odin.yaml +++ b/bin/yaml/odin.yaml @@ -1,5 +1,16 @@ compilers: odin: + type: tarballs + compression: gz + check_exe: odin version + url: https://github.com/odin-lang/Odin/releases/download/{name}/odin-linux-amd64-{name}.tar.gz + dir: odin-{name} + extract_into_folder: true + folder: odin + targets: + - dev-2024-12 + # odin-2024-11 was a weird zip/tar.gz combo + odin202411: type: ziparchive check_exe: odin version url: https://github.com/odin-lang/Odin/releases/download/{name}/odin-linux-amd64-{name}.zip From 06022b963ffc0c5f7c807b9007144dcd6c45d340 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Thu, 12 Dec 2024 15:13:15 +0000 Subject: [PATCH 7/8] Bump staging forward to autofs-compatible for testing --- terraform/lc.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/lc.tf b/terraform/lc.tf index 67288478..0a5f1b8c 100755 --- a/terraform/lc.tf +++ b/terraform/lc.tf @@ -1,6 +1,6 @@ locals { image_id = "ami-0cfaa1f31737d26b4" - staging_image_id = "ami-0410d305cc1eac4c1" + staging_image_id = "ami-0475858af6bc5f3c9" beta_image_id = "ami-0cfaa1f31737d26b4" gpu_image_id = "ami-0e49c31db87fb4332" aarch64prod_image_id = "ami-0940f416984ac4e8b" From d8a077c2d8b2303f160df3fe9fa519dbd3b4670f Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Thu, 12 Dec 2024 15:13:32 +0000 Subject: [PATCH 8/8] Revert "Add latest odin release (#1477)" This reverts commit b37c5b42b5071add3a6d06529e57317849771663. --- bin/yaml/odin.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/bin/yaml/odin.yaml b/bin/yaml/odin.yaml index 8c472326..5355042d 100644 --- a/bin/yaml/odin.yaml +++ b/bin/yaml/odin.yaml @@ -1,16 +1,5 @@ compilers: odin: - type: tarballs - compression: gz - check_exe: odin version - url: https://github.com/odin-lang/Odin/releases/download/{name}/odin-linux-amd64-{name}.tar.gz - dir: odin-{name} - extract_into_folder: true - folder: odin - targets: - - dev-2024-12 - # odin-2024-11 was a weird zip/tar.gz combo - odin202411: type: ziparchive check_exe: odin version url: https://github.com/odin-lang/Odin/releases/download/{name}/odin-linux-amd64-{name}.zip