From 835d9a721f01762a2c2fd71f2c6aff08a4baa2df Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 27 Sep 2022 11:15:08 +1000 Subject: [PATCH] add bors docs --- .github/PULL_REQUEST_TEMPLATE.md | 3 +++ README.md | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ce65aa9 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,3 @@ +<!-- +Pull requests from forks don't have automatic CI checks, an admin will need to trigger CI by posting a comment on the PR. +--> diff --git a/README.md b/README.md index 171c9b4..64c135f 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ in your home! We will regularly delete `/home` without further notice. ### Using your NixOS home-manager configuration on the hosts -If you happen to have your NixOS & home-manager configurations intertwined but +If you happen to have your NixOS & home-manager configurations intertwined but you'd like your familiar environment on our infrastructure you can evaluate `pkgs.writeShellScript "hm-activate" config.systemd.services.home-manager-<yourusername>.serviceConfig.ExecStart` from your NixOS configuration, and send this derivation to be realized remotely: @@ -40,6 +40,13 @@ If you hit any issues, ping us on Matrix in the room (see the admin list below) or create an issue here: [New Issue](https://github.com/nix-community/infra/issues/new). +### Pull requests from forks +As PRs from forks don't have automatic CI checks, admins can test PRs by posting a comment on the PR instead. + +* `bors try` - check if the PR builds. +* `bors merge` - same as `bors try` but will also merge the PR if it builds successfully. +* https://bors.tech/documentation/ + ### Administrators * @adisbladis @@ -93,7 +100,7 @@ This machine is meant as an aarch64 builder for our hydra instance running on bu * Provider: Oracle cloud * Instance type: [Ampere A1 Compute](https://www.oracle.com/cloud/compute/arm/) -* CPU: 4 VCPUs on an Ampere Altra (arm64) +* CPU: 4 VCPUs on an Ampere Altra (arm64) * RAM: 24GB * Drives: 200 GB Block