Separate prerelease and stable fury channel, use ddev not drud, fixes ddev#4707, fixes ddev#4628 [skip ci] (ddev#4808)

Author: rfay

.github/workflows/master-build.yml

@@ -220,7 +220,7 @@ jobs:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser-pro
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.DDEV_GITHUB_TOKEN }}
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

.goreleaser.yml

@@ -121,16 +121,19 @@ builds:
 ###### Archives ######
 archives:
 - id: ddev
+  rlcp: true
   builds:
   - ddev
   - mkcert
   - ddev_bash_completion.sh
   - ddev_zsh_completion.sh
   - ddev_fish_completion.sh
   format: tar.gz
-  name_template: "{{ .ProjectName }}_{{ .Os }}-{{ .Arch }}.v{{ .Version }}"
-  replacements:
-    darwin: macos
+  name_template: >-
+    {{ .ProjectName }}_
+    {{- if eq .Os "darwin" }}macos{{ else }}{{ .Os }}{{ end }}-
+    {{- .Arch }}.
+    v{{- .Version }}
   format_overrides:
   - goos: windows
     format: zip
@@ -140,12 +143,14 @@ archives:
   allow_different_binary_count: true
 
 - id: completions-tarball
+  rlcp: true
   builds:
   - completions-tarball
   format: binary
   name_template: ddev_shell_completion_scripts.v{{.Version}}.tar.gz
 
 - id: ddev-windows-installer
+  rlcp: true
   builds:
   - ddev-windows-installer
   format: binary
@@ -352,3 +357,5 @@ aurs:
 
 furies:
 - account: "{{ .Env.FURY_ACCOUNT }}"
+  secret_name: "FURY_TOKEN"
+  skip: '{{ ne .Prerelease "" }}'

docs/content/developers/buildkite-testmachine-setup.md

@@ -56,8 +56,11 @@ We are using [Buildkite](https://buildkite.com/ddev) for Windows and macOS testi
 11. Install basics in WSL2:
 
     ```bash
-    curl https://apt.fury.io/drud/gpg.key | sudo apt-key add -
-    echo "deb https://apt.fury.io/drud/ * *" | sudo tee -a /etc/apt/sources.list.d/ddev.list
+    curl -fsSL https://pkg.ddev.com/apt/gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ddev.gpg > /dev/null
+    echo "deb [signed-by=/etc/apt/trusted.gpg.d/ddev.gpg] https://pkg.ddev.com/apt/ * *" | sudo tee /etc/apt/sources.list.d/ddev.list >/dev/null
+    # Update package information and install DDEV
+    sudo apt update && sudo apt install -y ddev
+
     sudo mkdir -p /usr/sharekeyrings && curl -fsSL https://keys.openpgp.org/vks/v1/by-fingerprint/32A37959C2FA5C3C99EFBC32A79206696452D198 | sudo gpg --dearmor -o /usr/share/keyrings/buildkite-agent-archive-keyring.gpg
     echo "deb [signed-by=/usr/share/keyrings/buildkite-agent-archive-keyring.gpg] https://apt.buildkite.com/buildkite-agent stable main" | sudo tee /etc/apt/sources.list.d/buildkite-agent.list
     sudo apt update && sudo apt install -y build-essential buildkite-agent ca-certificates curl ddev gnupg lsb-release make mariadb-client

docs/content/users/install/ddev-installation.md

@@ -51,10 +51,10 @@ Once you’ve [installed a Docker provider](docker-installation.md), you’re re
 
     ```bash
     # Add DDEV’s GPG key to your keyring
-    curl -fsSL https://apt.fury.io/drud/gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ddev.gpg > /dev/null
-    
+    curl -fsSL https://pkg.ddev.com/apt/gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ddev.gpg > /dev/null
+
     # Add DDEV releases to your package repository
-    echo "deb [signed-by=/etc/apt/trusted.gpg.d/ddev.gpg] https://apt.fury.io/drud/ * *" | sudo tee /etc/apt/sources.list.d/ddev.list
+    echo "deb [signed-by=/etc/apt/trusted.gpg.d/ddev.gpg] https://pkg.ddev.com/apt/ * *" | sudo tee /etc/apt/sources.list.d/ddev.list >/dev/null
 
     # Update package information and install DDEV
     sudo apt update && sudo apt install -y ddev
@@ -74,16 +74,16 @@ Once you’ve [installed a Docker provider](docker-installation.md), you’re re
     ```bash
     # Add DDEV releases to your package repository
     echo '[ddev]
-    name=DDEV Repo
-    baseurl=https://yum.fury.io/drud/
-    enabled=1
-    gpgcheck=0' | sudo tee -a /etc/yum.repos.d/ddev.repo
+    name=ddev
+    baseurl=https://pkg.ddev.com/yum/
+    gpgcheck=0
+    enabled=1' | perl -p -e 's/^ +//' | sudo tee /etc/yum.repos.d/ddev.repo >/dev/null
 
     # Install DDEV
     sudo dnf install --refresh ddev
     ```
 
-    Signed repository support will be added in the near future.
+    Signed yum repository support will be added in the future.
 
     ### Arch Linux
 
@@ -245,8 +245,8 @@ Once you’ve [installed a Docker provider](docker-installation.md), you’re re
     12. Install DDEV:
 
         ```bash
-        curl https://apt.fury.io/drud/gpg.key | sudo apt-key add -
-        echo "deb https://apt.fury.io/drud/ * *" | sudo tee -a /etc/apt/sources.list.d/ddev.list
+        curl -fsSL https://pkg.ddev.com/apt/gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ddev.gpg > /dev/null
+        echo "deb [signed-by=/etc/apt/trusted.gpg.d/ddev.gpg] https://pkg.ddev.com/apt/ * *" | sudo tee /etc/apt/sources.list.d/ddev.list >/dev/null
         sudo apt update && sudo apt install -y ddev
         ```
 
@@ -293,10 +293,11 @@ Once you’ve [installed a Docker provider](docker-installation.md), you’re re
     1. [Open any repository](https://www.gitpod.io/docs/getting-started) using Gitpod and run the following:
         ```bash
         # Add DDEV’s GPG key to your keyring
-        curl -fsSL https://apt.fury.io/drud/gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ddev.gpg > /dev/null
+        curl -fsSL https://pkg.ddev.com/apt/gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ddev.gpg > /dev/null
 
         # Add DDEV releases to your package repository
-        echo "deb [signed-by=/etc/apt/trusted.gpg.d/ddev.gpg] https://apt.fury.io/drud/ * *" | sudo tee /etc/apt/sources.list.d/ddev.list
+        echo "deb [signed-by=/etc/apt/trusted.gpg.d/ddev.gpg] https://pkg.ddev.com/apt/ * *" | sudo tee /etc/apt/sources.list.d/ddev.list >/dev/null
+
 
         # Update package information and install DDEV
         sudo apt update && sudo apt install -y ddev