From 41f83f51c8362675b4092d745440e1ded4afb9e2 Mon Sep 17 00:00:00 2001 From: Aaron Meese Date: Sun, 12 Dec 2021 16:25:43 -0500 Subject: [PATCH] Replaced coordination with cooperation It seems that the name was changed at some point or something along those lines, so using coordination breaks the setup process. --- .github/workflows/bonfire.yaml | 2 +- docs/DEPLOY.md | 4 ++-- docs/HACKING.md | 4 ++-- nix/module.nix | 4 ++-- nix/package.nix | 2 +- nix/shell.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/bonfire.yaml b/.github/workflows/bonfire.yaml index 6bb33e860c..00caa76b22 100755 --- a/.github/workflows/bonfire.yaml +++ b/.github/workflows/bonfire.yaml @@ -87,7 +87,7 @@ jobs: run: mix test test_cooperation_flavour: - name: Test coordination flavour + name: Test cooperation flavour runs-on: ubuntu-latest container: elixir:alpine env: diff --git a/docs/DEPLOY.md b/docs/DEPLOY.md index a7b0dbe0a0..2e7fbe0dbf 100755 --- a/docs/DEPLOY.md +++ b/docs/DEPLOY.md @@ -27,9 +27,9 @@ $ cd bonfire 2. The first thing to do is choosing what flavour of Bonfire you want to deploy (the default is `classic`), as each flavour has its own Docker image and config. -For example if you want to run the `coordination` flavour (you may want to use direnv or something similar to persist this): +For example if you want to run the `cooperation` flavour (you may want to use direnv or something similar to persist this): -`export FLAVOUR=coordination MIX_ENV=prod` +`export FLAVOUR=cooperation MIX_ENV=prod` 3. Once you've picked a flavour, run this command to initialise some default config (.env files which won't be checked into git): diff --git a/docs/HACKING.md b/docs/HACKING.md index e8af7164ec..d69c80d131 100755 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -23,9 +23,9 @@ $ cd bonfire - The first thing to do is choosing what flavour of Bonfire you want to hack on (the default is `classic`), as each flavour has its own config. -For example if you want to run the `coordination` flavour: +For example if you want to run the `cooperation` flavour: -`export FLAVOUR=coordination` +`export FLAVOUR=cooperation` - Once you've picked a flavour, run this command to initialise some default config (.env files which won't be checked into git): diff --git a/nix/module.nix b/nix/module.nix index 7fad4e9dc0..953bf52a39 100755 --- a/nix/module.nix +++ b/nix/module.nix @@ -96,8 +96,8 @@ in POSTGRES_SOCKET_DIR = lib.mkIf (dbSocketDir != null) dbSocketDir; HOSTNAME = hostname; WITH_DOCKER = "no"; - FLAVOUR = "coordination"; - BONFIRE_FLAVOUR = "flavours/coordination"; + FLAVOUR = "cooperation"; + BONFIRE_FLAVOUR = "flavours/cooperation"; }; }; }; diff --git a/nix/package.nix b/nix/package.nix index 6b4813f1d4..cf0cd7ceb9 100755 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,4 +1,4 @@ -{ pkgs, self, flavour ? "coordination" }: +{ pkgs, self, flavour ? "cooperation" }: let beamPackages = with pkgs; beam.packagesWith beam.interpreters.erlang; in diff --git a/nix/shell.nix b/nix/shell.nix index 48491ae478..d89f784d72 100755 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -1,4 +1,4 @@ -{ pkgs, flavour ? "coordination" }: +{ pkgs, flavour ? "cooperation" }: with pkgs;