From 68e0d355540b652f92a556817a0b3364253c0bdf Mon Sep 17 00:00:00 2001
From: Ofek Lev <ofekmeister@gmail.com>
Date: Tue, 20 Jun 2023 14:18:28 -0400
Subject: [PATCH] Fix ddev platform installers and releasing (#14812)

---
 .github/workflows/build-ddev.yml   | 12 +++++-----
 .github/workflows/release-ddev.yml | 37 ------------------------------
 ddev/pyoxidizer.bzl                |  4 ++--
 3 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/release-ddev.yml

diff --git a/.github/workflows/build-ddev.yml b/.github/workflows/build-ddev.yml
index a3eb2d6f81cfa..894c1cc8d915d 100644
--- a/.github/workflows/build-ddev.yml
+++ b/.github/workflows/build-ddev.yml
@@ -22,7 +22,7 @@ defaults:
     working-directory: ddev
 
 env:
-  APP_NAME: ddev         
+  APP_NAME: ddev
   PYTHON_VERSION: "3.9"
   PYOXIDIZER_VERSION: "0.24.0"
 
@@ -179,17 +179,17 @@ jobs:
       run: |-
         mkdir packaging
         cd dist/app
-        echo $PWD 
+        echo $PWD
 
         binary="$(ls)"
 
         if [[ "$binary" =~ -pc-windows- ]]; then
           7z a "../../packaging/${binary:0:-4}.zip" "$binary"
-          echo $PWD 
+          echo $PWD
         else
           chmod +x "$binary"
           tar -czf "../../packaging/$binary.tar.gz" "$binary"
-          echo $PWD 
+          echo $PWD
         fi
 
     - name: Upload staged archive
@@ -478,11 +478,11 @@ jobs:
       with:
         skip-existing: true
         user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        password: ${{ secrets.PYPI_TOKEN_DDEV }}
 
     - name: Add assets to current release
       uses: softprops/action-gh-release@v1
       with:
         files: |-
           archives/*
-          installers/*
\ No newline at end of file
+          installers/*
diff --git a/.github/workflows/release-ddev.yml b/.github/workflows/release-ddev.yml
deleted file mode 100644
index a599271954ad8..0000000000000
--- a/.github/workflows/release-ddev.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: release-ddev
-
-on:
-  push:
-    tags:
-      - ddev-*
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.9'
-
-    - name: Upgrade Python packaging tools
-      run: pip install --disable-pip-version-check --upgrade pip setuptools wheel
-
-    - name: Install ddev
-      run: |
-        pip install -e ./datadog_checks_dev[cli]
-        pip install -e ./ddev
-
-    - name: Configure ddev
-      run: |
-        ddev config set repos.core .
-        ddev config set repo core
-
-    - name: Release ddev
-      run: ddev release upload -s ddev
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN_DDEV }}
diff --git a/ddev/pyoxidizer.bzl b/ddev/pyoxidizer.bzl
index 3383bf8091316..0abf244ff862d 100644
--- a/ddev/pyoxidizer.bzl
+++ b/ddev/pyoxidizer.bzl
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 VERSION = VARS["version"]
 APP_NAME = "ddev"
-DISPLAY_NAME = "Datadog Agent integration developer tool"
+DISPLAY_NAME = "ddev"
 AUTHOR = "Datadog, Inc."
 
 
@@ -72,7 +72,7 @@ def make_macos_app_bundle():
     bundle = MacOsApplicationBundleBuilder(DISPLAY_NAME)
     bundle.set_info_plist_required_keys(
         display_name=DISPLAY_NAME,
-        identifier="com.datadoghq." + APP_NAME,         
+        identifier="com.datadoghq." + APP_NAME,
         version=VERSION,
         signature=APP_NAME,
         executable=APP_NAME,