Skip to content

Commit 7b28dcb

Browse files
committed
feat(script): Update package name and JSON template variables
Refactor the package name and JSON template variables in the release vendor script for better clarity and consistency. This change ensures that the package naming convention aligns with the vendor structure. Signed-off-by: Chiho Sin <[email protected]>
1 parent c76dd2c commit 7b28dcb

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

.github/scripts/on-release-vendor.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ RELEASE_TAG=$(echo "$EVENT_JSON" | jq -r '.release.tag_name')
2828
RELEASE_BRANCH=$(echo "$EVENT_JSON" | jq -r '.release.target_commitish')
2929
RELEASE_ID=$(echo "$EVENT_JSON" | jq -r '.release.id')
3030

31-
SCRIPTS_DIR="./.github/scripts"
32-
OUTPUT_DIR="$GITHUB_WORKSPACE/build"
33-
PACKAGE_NAME="esp32-$RELEASE_TAG"
34-
PACKAGE_JSON_MERGE="$GITHUB_WORKSPACE/.github/scripts/merge_packages.py"
35-
PACKAGE_JSON_TEMPLATE="$GITHUB_WORKSPACE/package/package_esp32_index.template.json"
36-
PACKAGE_JSON_DEV="package_esp32_dev_index.json"
37-
PACKAGE_JSON_REL="package_esp32_index.json"
38-
3931
echo "Event: $GITHUB_EVENT_NAME, Repo: $GITHUB_REPOSITORY, Path: $GITHUB_WORKSPACE, Ref: $GITHUB_REF"
4032
echo "Action: $action, Branch: $RELEASE_BRANCH, ID: $RELEASE_ID"
4133
echo "Tag: $RELEASE_TAG, Draft: $draft, Pre-Release: $RELEASE_PRE"
@@ -51,6 +43,15 @@ EMAIL=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.ema
5143
CATEGORY=$(cat "$GITHUB_WORKSPACE/vendor.json" | grep -Pzo '(?s){.*}' | jq -r '.category? // empty' | xargs echo -n 2>/dev/null)
5244

5345

46+
SCRIPTS_DIR="./.github/scripts"
47+
OUTPUT_DIR="$GITHUB_WORKSPACE/build"
48+
PACKAGE_NAME="${PACKAGER}-esp32-arduino-$RELEASE_TAG"
49+
PACKAGE_JSON_MERGE="$GITHUB_WORKSPACE/.github/scripts/merge_packages.py"
50+
PACKAGE_JSON_TEMPLATE="$GITHUB_WORKSPACE/package/package_esp32_index.template.json"
51+
PACKAGE_JSON_DEV="package_${PACKAGER}_esp32_dev_index.json"
52+
PACKAGE_JSON_REL="package_${PACKAGER}_esp32_index.json"
53+
54+
5455
if [ -n "${BOARDS}" ]; then
5556
echo "Releasing board(s): $BOARDS"
5657
fi

0 commit comments

Comments
 (0)