From b2d2095f39f52446a977c4c1272ecc0e21b69769 Mon Sep 17 00:00:00 2001 From: Mike iLL Kilmer Date: Wed, 21 Jun 2023 22:13:07 -0500 Subject: [PATCH 1/2] Update build-after.yml (#1489) This might also help others in the future. --- deploy-hooks/build-after.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy-hooks/build-after.yml b/deploy-hooks/build-after.yml index 9cce3a2ac3..7ed1b7e836 100644 --- a/deploy-hooks/build-after.yml +++ b/deploy-hooks/build-after.yml @@ -3,6 +3,7 @@ # ⚠️ This example assumes your theme is using Sage 10 # # Uncomment the lines below if you are using Sage 10 +# NOTE: this task will fail if Sage theme is not activated at time of deployment. # # --- # - name: Run Acorn optimize From c9f4dd918cb0a708b298c506785b09c7e0e80e3a Mon Sep 17 00:00:00 2001 From: Scott Walkinshaw Date: Wed, 21 Jun 2023 23:14:08 -0400 Subject: [PATCH 2/2] CLI config updates (#1486) Trellis CLI is now preferring `trellis.cli.yml` as the main config file path over `.trellis/cli.yml` (though it remains supported). This now makes it possible to gitignore the entire `.trellis` directory as it contains CLI generated files for machine use only. `.trellis/cli.yml` is exempted in the gitignore for legacy compatibility purposes. --- .gitignore | 4 +++- trellis.cli.yml | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 trellis.cli.yml diff --git a/.gitignore b/.gitignore index d0fc5f0aa7..5fd7350b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ vagrant.local.yml vendor/roles *.py[co] *.retry -.trellis/virtualenv +.trellis/* +!.trellis/cli.yml +trellis.cli.local.yml diff --git a/trellis.cli.yml b/trellis.cli.yml new file mode 100644 index 0000000000..7cfe2470b0 --- /dev/null +++ b/trellis.cli.yml @@ -0,0 +1,6 @@ +# Trellis CLI example config file +# https://roots.io/trellis/docs/cli/#configuration +# +# database_app: sequel-ace +# open: +# admin: "https://mysite.com/wp/wp-admin"