Merge branch 'master' into ubuntu-24-04

Author: retlehs

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Check release (dry-run)
         run: |
           goreleaser check
-          goreleaser release --snapshot --skip-publish --rm-dist
+          goreleaser release --snapshot --clean --skip publish
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_ACCESS_TOKEN }}
 

.goreleaser.yml

@@ -1,4 +1,5 @@
 project_name: trellis
+version: 2
 before:
   hooks:
   - go mod download
@@ -39,7 +40,7 @@ brews:
     repository:
       owner: roots
       name: homebrew-tap
-    folder: Formula
+    directory: Formula
     homepage:  https://roots.io/trellis
     description: A CLI to manage Trellis projects
     install: |

README.md

@@ -19,7 +19,7 @@ However, the amount of effort needed to maintain and develop new features and pr
 <p align="center"><a href="https://github.com/sponsors/roots"><img height="32" src="https://img.shields.io/badge/sponsor%20roots-525ddc?logo=github&logoColor=ffffff&message=" alt="Sponsor Roots"></a></p>
 
 <div align="center">
-<a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="148" height="111"></a> <a href="https://carrot.com/"><img src="https://cdn.roots.io/app/uploads/carrot.svg" alt="Carrot" width="148" height="111"></a> <a href="https://wordpress.com/"><img src="https://cdn.roots.io/app/uploads/wordpress.svg" alt="WordPress.com" width="148" height="111"></a> <a href="https://worksitesafety.ca/careers/"><img src="https://cdn.roots.io/app/uploads/worksite-safety.svg" alt="Worksite Safety" width="148" height="111"></a>
+<a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="148" height="111"></a> <a href="https://carrot.com/"><img src="https://cdn.roots.io/app/uploads/carrot.svg" alt="Carrot" width="148" height="111"></a> <a href="https://wordpress.com/"><img src="https://cdn.roots.io/app/uploads/wordpress.svg" alt="WordPress.com" width="148" height="111"></a> <a href="https://worksitesafety.ca/careers/"><img src="https://cdn.roots.io/app/uploads/worksite-safety.svg" alt="Worksite Safety" width="148" height="111"></a> <a href="https://www.itineris.co.uk/"><img src="https://cdn.roots.io/app/uploads/itineris.svg" alt="Itineris" width="148" height="111"></a>
 </div>
 
 ## Quick Install (macOS and Linux via Homebrew)

cmd/files/playbooks/alias_template.yml.j2

@@ -1,9 +1,9 @@
 {% if include_local_env | default(false) %}
 "@{{ env }}":
   ssh: "{{ local_hostname_alias }}"
-  path: "{{ www_root + '/' + item.key | regex_replace('^~\/','') }}/{{ item.value.current_path | default('current') }}/{{ item.value.public_path | default('web') }}/wp"
+  path: "{{ project_root | default(www_root + '/' + item.key) | regex_replace('^~\/','') }}/{{ item.value.current_path | default('current') }}/{{ item.value.public_path | default('web') }}/wp"
 {% else %}
 "@{{ env }}":
   ssh: "{{ web_user }}@{{ ansible_host }}:{{ ansible_port | default('22') }}"
-  path: "{{ www_root + '/' + item.key | regex_replace('^~\/','') }}/{{ item.value.current_path | default('current') }}/{{ item.value.public_path | default('web') }}/wp"
+  path: "{{ project_root | default(www_root + '/' + item.key) | regex_replace('^~\/','') }}/{{ item.value.current_path | default('current') }}/{{ item.value.public_path | default('web') }}/wp"
 {% endif %}