Fix ddev platform installers and releasing (#14812)

DataDog · Jun 20, 2023 · 68e0d35 · 68e0d35
1 parent 9acf95c
commit 68e0d35
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 45 deletions.
diff --git 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/*
+          installers/*
diff --git a/.github/workflows/release-ddev.yml b/.github/workflows/release-ddev.yml
diff --git 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,