From 392ef0416612d487abee266deae228ae97af695b Mon Sep 17 00:00:00 2001
From: Simon Gilli <25326036+gilbertsoft@users.noreply.github.com>
Date: Wed, 5 Jul 2023 09:24:53 +0200
Subject: [PATCH 1/2] ci: fix PR build for forks [skip ci]

PR builds should use the AMPLITUDE_API_KEY_DEV secret to build the
executables which currently does not work. To be able to use secrets in
PRs which are created from fork repos pull_request_target must be used
instead of pull_request.
---
 .github/workflows/pr-build.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index ce0064b8064..235ddab8323 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -1,11 +1,7 @@
 name: PR Build
 
-defaults:
-  run:
-    shell: bash
-
 on:
-  pull_request:
+  pull_request_target:
     paths:
       - ".github/workflows/**"
       - "cmd/**"
@@ -15,13 +11,16 @@ on:
       - "go.*"
       - "Makefile"
 
+defaults:
+  run:
+    shell: bash
+  
 env:
   BUILDKIT_PROGRESS: plain
   DOCKER_CLI_EXPERIMENTAL: enabled
   DDEV_DEBUG: true
   HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
 permissions:
   contents: read
 
@@ -37,6 +36,7 @@ jobs:
           # We need to get all branches and tags for git describe to work properly
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
+
       - name: Set up Homebrew
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
@@ -63,26 +63,31 @@ jobs:
         with:
           name: all-ddev-executables
           path: ${{ github.workspace }}/artifacts/*
+
       - name: Upload macos-amd64 binary
         uses: actions/upload-artifact@v3
         with:
           name: ddev-macos-amd64
           path: .gotmp/bin/darwin_amd64/ddev
+
       - name: Upload macos-arm64 binary
         uses: actions/upload-artifact@v3
         with:
           name: ddev-macos-arm64
           path: .gotmp/bin/darwin_arm64/ddev
+
       - name: Upload linux-arm64 binary
         uses: actions/upload-artifact@v3
         with:
           name: ddev-linux-arm64
           path: .gotmp/bin/linux_arm64/ddev
+
       - name: Upload linux-amd64 binary
         uses: actions/upload-artifact@v3
         with:
           name: ddev-linux-amd64
           path: .gotmp/bin/linux_amd64/ddev
+
       - name: Upload windows_amd64 installer
         uses: actions/upload-artifact@v3
         with:

From 904806fcf5c36172f2bb61f0bfef3347906d877c Mon Sep 17 00:00:00 2001
From: Gilbertsoft <25326036+gilbertsoft@users.noreply.github.com>
Date: Wed, 5 Jul 2023 19:12:00 +0200
Subject: [PATCH 2/2] Update root.go

---
 cmd/ddev/cmd/root.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/ddev/cmd/root.go b/cmd/ddev/cmd/root.go
index 2bdcb778bc8..f38fb1131e6 100644
--- a/cmd/ddev/cmd/root.go
+++ b/cmd/ddev/cmd/root.go
@@ -29,7 +29,7 @@ var (
 // RootCmd represents the base command when called without any subcommands
 var RootCmd = &cobra.Command{
 	Use:   "ddev",
-	Short: "DDEV local development environment",
+	Short: "DDEV best local development environment",
 	Long: `Create and maintain a local web development environment.
 Docs: https://ddev.readthedocs.io
 Support: https://ddev.readthedocs.io/en/stable/users/support`,