Skip to content

Commit 68e0d35

Browse files
authored
Fix ddev platform installers and releasing (#14812)
1 parent 9acf95c commit 68e0d35

3 files changed

Lines changed: 8 additions & 45 deletions

File tree

‎.github/workflows/build-ddev.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ defaults:
2222
working-directory: ddev
2323

2424
env:
25-
APP_NAME: ddev
25+
APP_NAME: ddev
2626
PYTHON_VERSION: "3.9"
2727
PYOXIDIZER_VERSION: "0.24.0"
2828

@@ -179,17 +179,17 @@ jobs:
179179
run: |-
180180
mkdir packaging
181181
cd dist/app
182-
echo $PWD
182+
echo $PWD
183183
184184
binary="$(ls)"
185185
186186
if [[ "$binary" =~ -pc-windows- ]]; then
187187
7z a "../../packaging/${binary:0:-4}.zip" "$binary"
188-
echo $PWD
188+
echo $PWD
189189
else
190190
chmod +x "$binary"
191191
tar -czf "../../packaging/$binary.tar.gz" "$binary"
192-
echo $PWD
192+
echo $PWD
193193
fi
194194
195195
- name: Upload staged archive
@@ -478,11 +478,11 @@ jobs:
478478
with:
479479
skip-existing: true
480480
user: __token__
481-
password: ${{ secrets.PYPI_API_TOKEN }}
481+
password: ${{ secrets.PYPI_TOKEN_DDEV }}
482482

483483
- name: Add assets to current release
484484
uses: softprops/action-gh-release@v1
485485
with:
486486
files: |-
487487
archives/*
488-
installers/*
488+
installers/*

‎.github/workflows/release-ddev.yml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎ddev/pyoxidizer.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: MIT
44
VERSION = VARS["version"]
55
APP_NAME = "ddev"
6-
DISPLAY_NAME = "Datadog Agent integration developer tool"
6+
DISPLAY_NAME = "ddev"
77
AUTHOR = "Datadog, Inc."
88

99

@@ -72,7 +72,7 @@ def make_macos_app_bundle():
7272
bundle = MacOsApplicationBundleBuilder(DISPLAY_NAME)
7373
bundle.set_info_plist_required_keys(
7474
display_name=DISPLAY_NAME,
75-
identifier="com.datadoghq." + APP_NAME,
75+
identifier="com.datadoghq." + APP_NAME,
7676
version=VERSION,
7777
signature=APP_NAME,
7878
executable=APP_NAME,

0 commit comments

Comments
 (0)