Skip to content

Commit

Permalink
Merge branch 'master' into chore-team-repo-ci-update-to-nodejs-runtim…
Browse files Browse the repository at this point in the history
…e-20
  • Loading branch information
marcoieni authored Sep 20, 2024
2 parents b4ff284 + 5a272d1 commit 9c2485a
Show file tree
Hide file tree
Showing 65 changed files with 509 additions and 1,390 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
on: [push, pull_request]
on:
push:
branches:
- master
pull_request:

jobs:
rust:
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion ansible/apply
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -74,7 +76,13 @@ def run_playbook(args):
ansible_args += ["-u", args.user]
if args.start_at_task is not None:
ansible_args += ["--start-at-task", args.start_at_task]
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:
Expand Down
2 changes: 1 addition & 1 deletion ansible/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ansible==7.3.0
ansible==8.7.0
boto3==1.26.94
passlib==1.7.4
2 changes: 2 additions & 0 deletions ansible/roles/dev-desktop/files/podman/storage.conf
Original file line number Diff line number Diff line change
@@ -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"
9 changes: 8 additions & 1 deletion ansible/roles/dev-desktop/tasks/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -59,6 +60,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
Expand Down
30 changes: 0 additions & 30 deletions ansible/roles/dev-desktop/tasks/fix_llvm_55575.yml

This file was deleted.

1 change: 0 additions & 1 deletion ansible/roles/dev-desktop/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@
- include_tasks: github.yml
- include_tasks: motd.yml
- include_tasks: scripts.yml
- include_tasks: fix_llvm_55575.yml
34 changes: 17 additions & 17 deletions terraform/bors/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 45 additions & 45 deletions terraform/crater/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions terraform/crater/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.20"
version = "~> 5.65"
}

google = {
source = "hashicorp/google"
version = "~> 4.23"
version = "~> 6.0.1"
}

dns = {
source = "hashicorp/dns"
version = "~> 3.2.3"
version = "~> 3.4.1"
}
}

Expand Down
34 changes: 17 additions & 17 deletions terraform/crates-io-heroku-metrics/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions terraform/docs-rs/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9c2485a

Please sign in to comment.