Merge branch 'master' into playground-upkeep

.github/workflows/main.yml

@@ -1,4 +1,8 @@
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   rust:

Cargo.toml

@@ -1,4 +1,7 @@
 [workspace]
+# Opt-in to the new feature resolver introduced in Rust 1.51 and Edition 2021.
+# https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions
+resolver = "2"
 members = [
     "setup-deploy-keys",
     "ansible/roles/dev-desktop/files/team_login",

ansible/apply

@@ -5,6 +5,8 @@ import shutil
 import subprocess
 import sys
 import tempfile
+import os
+import platform
 
 BASE_PATH = pathlib.Path(__file__).resolve().parent
 VENV_PATH = BASE_PATH / ".venv"
@@ -78,7 +80,13 @@ def run_playbook(args):
             ansible_args += ["--check"]
         if args.diff:
             ansible_args += ["--diff"]
-        res = subprocess.run(ansible_args, cwd=str(tempdir))
+
+        env = os.environ.copy()
+        # Set environment variable if running on macOS to avoid python crash
+        if platform.system() == "Darwin":
+            env["OBJC_DISABLE_INITIALIZE_FORK_SAFETY"] = "true"
+
+        res = subprocess.run(ansible_args, cwd=str(tempdir), env=env)
         if res.returncode != 0:
             exit(1)
     finally:

ansible/envs/dev-example/hosts

@@ -6,6 +6,3 @@
 
 [crater]
 # crater-agent.local
-
-[gha_self_hosted]
-# gha-self-hosted.local

ansible/envs/prod/hosts

@@ -8,10 +8,6 @@ monitoring.infra.rust-lang.org
 crater-azure-1.infra.rust-lang.org
 crater-azure-2.infra.rust-lang.org
 
-[gha_self_hosted]
-ci-arm-1.infra.rust-lang.org
-ci-arm-2.infra.rust-lang.org
-
 [playground]
 play-1.infra.rust-lang.org
 

ansible/group_vars/all.yml

@@ -4,6 +4,7 @@ global_sudo_users:
   - simulacrum
   - pietro
   - jdn
+  - marcoieni
 
 global_collect_metrics_from:
   - 52.9.166.219  # monitoring.infra.rust-lang.org

ansible/playbooks/monitoring.yml

@@ -58,7 +58,6 @@
             # List of instances to scrape for system metrics
             - targets:
               - "{{ inventory_hostname }}:9100"
-              - ci-arm-1.infra.rust-lang.org:9100
               - crater.infra.rust-lang.org:9100
               - docsrs.infra.rust-lang.org:9100
               - bastion.infra.rust-lang.org:9100
@@ -189,12 +188,6 @@
               labels:
                 dispatch: pagerduty-cratesio
 
-            - alert: SlowDownloads
-              expr: histogram_quantile(0.99, sum by (le) (rate(cratesio_instance_response_times_bucket{job="cratesio_heroku_metrics",app="crates-io",endpoint="/api/v1/crates/:crate_id/:version/download"}[30s]))) >= 1
-              for: 1m
-              labels:
-                dispatch: pagerduty-cratesio
-
         - name: docsrs
           rules:
             - alert: DocsRsDown

ansible/requirements.txt

@@ -1,3 +1,3 @@
-ansible==7.3.0
+ansible==8.7.0
 boto3==1.26.94
 passlib==1.7.4

ansible/roles/common/files/ssh-keys/marcoieni.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBrmhY/PexymDRulNHnF1L89GLS9sa/RfDU0kd6NjIX3

ansible/roles/dev-desktop/files/podman/storage.conf

@@ -1,5 +1,7 @@
 [storage]
   driver = "overlay"
+  runroot = "/run/containers/storage"
+  graphroot = "/var/lib/containers/storage"
 
 [storage.options.overlay]
   mount_program = "/usr/bin/fuse-overlayfs"

ansible/roles/dev-desktop/files/team_login/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Oli Scherer <[email protected]>"]
-edition = "2018"
+edition = "2021"
 name = "team_login"
 version = "0.1.0"
 

ansible/roles/dev-desktop/tasks/dependencies.yml

@@ -16,6 +16,7 @@
       - clang
       - cmake
       - gcc-mingw-w64-x86-64 # Allows running `x check --target x86_64-pc-windows-gnu`
+      - earlyoom # Earlyoom kills processes using too much memory before they can cause trouble.
       - jq
       - libssl-dev
       - llvm
@@ -42,7 +43,7 @@
       - libgbm1
       - libpango-1.0-0
       - libcairo2
-      - libasound2
+      - libasound2t64
       - libatspi2.0-0
       - libelf-dev  # Allows building tools that link against libelf
       - libsecret-1-dev # used by cargo
@@ -51,6 +52,7 @@
       - lld
       - lldb
       - mold
+      - gdb
       - neovim
       - parallel
       # Necessary for building rr
@@ -59,6 +61,12 @@
       - zsh
     state: present
 
+# we don't need it because we don't need to send emails
+- name: Uninstall postfix
+  apt:
+    name: postfix
+    state: absent
+
 - name: Uninstall fish from apt
   apt:
     name: fish