Skip to content

ci(deploy): Fix deploy output #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2025
+215 −208
Merged

ci(deploy): Fix deploy output #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defaults:
jobs:
build-libs:
name: Build with IDF ${{ matrix.idf_branch }}
if: github.repository_owner == 'espressif'
if: github.repository_owner == 'espressif' || github.event_name == 'workflow_dispatch'
uses: ./.github/workflows/cron_build.yml
with:
idf_branch: ${{ matrix.idf_branch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cron_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
source ./tools/check-deploy-needed.sh
bash ./tools/check-deploy-needed.sh
targets_list=$(echo "${{ inputs.targets }}" | sed 's/ *, */,/g' | sed 's/^/["/' | sed 's/$/"]/' | sed 's/,/","/g')
echo "Targets list: $targets_list"
echo "targets_list=$targets_list" >> $GITHUB_OUTPUT
Expand Down
113 changes: 64 additions & 49 deletions tools/check-deploy-needed.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,104 @@
#/bin/bash
#!/bin/bash

source ./tools/config.sh

IDF_COMMIT=`github_last_commit "$IDF_REPO" "$IDF_BRANCH"`
IDF_COMMIT=$(github_last_commit "$IDF_REPO" "$IDF_BRANCH")

if [ -z $IDF_COMMIT ]; then
if [ -z "$IDF_COMMIT" ]; then
echo "Failed to get IDF commit for branch $IDF_BRANCH"
exit 1
fi

if [ -z $GITHUB_HEAD_REF ]; then
current_branch=`git branch --show-current`
if [ -z "$GITHUB_HEAD_REF" ]; then
current_branch=$(git branch --show-current)
else
current_branch="$GITHUB_HEAD_REF"
fi

AR_BRANCH="master"
if [[ "$current_branch" != "master" && `github_branch_exists "$AR_REPO" "$current_branch"` == "1" ]]; then
if [[ "$current_branch" != "master" && $(github_branch_exists "$AR_REPO" "$current_branch") == "1" ]]; then
AR_BRANCH="$current_branch"
else
AR_BRANCH_NAME="idf-$IDF_BRANCH"
has_ar_branch=`github_branch_exists "$AR_REPO" "$AR_BRANCH_NAME"`
has_ar_branch=$(github_branch_exists "$AR_REPO" "$AR_BRANCH_NAME")
if [ "$has_ar_branch" == "1" ]; then
AR_BRANCH="$AR_BRANCH_NAME"
else
has_ar_branch=`github_branch_exists "$AR_REPO" "$AR_PR_TARGET_BRANCH"`
has_ar_branch=$(github_branch_exists "$AR_REPO" "$AR_PR_TARGET_BRANCH")
if [ "$has_ar_branch" == "1" ]; then
AR_BRANCH="$AR_PR_TARGET_BRANCH"
fi
fi
fi

echo "AR_BRANCH: $AR_BRANCH"
echo "AR_BRANCH_NAME: $AR_BRANCH_NAME"
echo "AR_PR_TARGET_BRANCH: $AR_PR_TARGET_BRANCH"
echo "has_ar_branch: $has_ar_branch"

# format new branch name and pr title
AR_NEW_BRANCH_NAME="idf-$IDF_BRANCH"
AR_NEW_COMMIT_MESSAGE="IDF $IDF_BRANCH $IDF_COMMIT"
AR_NEW_PR_TITLE="IDF $IDF_BRANCH"

LIBS_RELEASE_TAG="idf-"${IDF_BRANCH//\//_}""
LIBS_RELEASE_TAG="idf-${IDF_BRANCH//\//_}"
LIBS_VERSION_PREFIX="$LIBS_RELEASE_TAG-$IDF_COMMIT-v"
VERSION_COUNTER=1

AR_HAS_BRANCH=`github_branch_exists "$AR_REPO" "$AR_NEW_BRANCH_NAME"`
AR_HAS_BRANCH=$(github_branch_exists "$AR_REPO" "$AR_NEW_BRANCH_NAME")
if [ "$AR_HAS_BRANCH" == "1" ]; then
LATEST_LIBS_IDF=`github_get_libs_idf "$AR_REPO" "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE"`
LATEST_LIBS_IDF=$(github_get_libs_idf "$AR_REPO" "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE")
else
LATEST_LIBS_IDF=`github_get_libs_idf "$AR_REPO" "$AR_BRANCH" "$AR_NEW_PR_TITLE"`
LATEST_LIBS_IDF=$(github_get_libs_idf "$AR_REPO" "$AR_BRANCH" "$AR_NEW_PR_TITLE")
fi

echo "AR_NEW_BRANCH_NAME: $AR_NEW_BRANCH_NAME"
echo "AR_NEW_COMMIT_MESSAGE: $AR_NEW_COMMIT_MESSAGE"
echo "AR_NEW_PR_TITLE: $AR_NEW_PR_TITLE"

echo "LIBS_RELEASE_TAG: $LIBS_RELEASE_TAG"
echo "LIBS_VERSION_PREFIX: $LIBS_VERSION_PREFIX"
echo "VERSION_COUNTER: $VERSION_COUNTER"

echo "AR_HAS_BRANCH: $AR_HAS_BRANCH"
echo "LATEST_LIBS_IDF: $LATEST_LIBS_IDF"

echo "Current IDF commit: $IDF_COMMIT"
echo "Latest IDF commit in $AR_BRANCH of $AR_REPO: $LATEST_LIBS_IDF"

AR_HAS_COMMIT=`if [ "$LATEST_LIBS_IDF" == "$IDF_COMMIT" ]; then echo "1"; else echo "0"; fi`
AR_HAS_PR=`github_pr_exists "$AR_REPO" "$AR_NEW_BRANCH_NAME"`
AR_HAS_COMMIT=$(if [ "$LATEST_LIBS_IDF" == "$IDF_COMMIT" ]; then echo "1"; else echo "0"; fi)
AR_HAS_PR=$(github_pr_exists "$AR_REPO" "$AR_NEW_BRANCH_NAME")

echo "AR_HAS_COMMIT: $AR_HAS_COMMIT"
echo "AR_HAS_PR: $AR_HAS_PR"

LIBS_RELEASE_ID=$(github_release_id "$AR_LIBS_REPO" "$LIBS_RELEASE_TAG")
LIBS_HAS_RELEASE=$(if [ -n "$LIBS_RELEASE_ID" ]; then echo "1"; else echo "0"; fi)

LIBS_RELEASE_ID=`github_release_id "$AR_LIBS_REPO" "$LIBS_RELEASE_TAG"`
LIBS_HAS_RELEASE=`if [ -n "$LIBS_RELEASE_ID" ]; then echo "1"; else echo "0"; fi`
echo "LIBS_RELEASE_ID: $LIBS_RELEASE_ID"
echo "LIBS_HAS_RELEASE: $LIBS_HAS_RELEASE"

if [ "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]; then
echo "Workflow dispatch event. Generating new libs."
while true; do
LIBS_ASSET_ID=`github_release_asset_id "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "esp32-arduino-libs-$LIBS_VERSION_PREFIX$VERSION_COUNTER.zip"`
LIBS_ASSET_ID=$(github_release_asset_id "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "esp32-arduino-libs-$LIBS_VERSION_PREFIX$VERSION_COUNTER.zip")
if [ -n "$LIBS_ASSET_ID" ]; then
VERSION_COUNTER=$((VERSION_COUNTER+1))
else
break
fi
done
else
LIBS_ASSET_ID=`github_release_asset_id "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "esp32-arduino-libs-$LIBS_VERSION_PREFIX$VERSION_COUNTER.zip"`
LIBS_ASSET_ID=$(github_release_asset_id "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "esp32-arduino-libs-$LIBS_VERSION_PREFIX$VERSION_COUNTER.zip")
fi

echo "LIBS_ASSET_ID: $LIBS_ASSET_ID"

LIBS_VERSION="$LIBS_VERSION_PREFIX$VERSION_COUNTER"
LIBS_HAS_ASSET=`if [ -n "$LIBS_ASSET_ID" ]; then echo "1"; else echo "0"; fi`
LIBS_HAS_ASSET=$(if [ -n "$LIBS_ASSET_ID" ]; then echo "1"; else echo "0"; fi)

echo "LIBS_VERSION: $LIBS_VERSION"
echo "LIBS_HAS_ASSET: $LIBS_HAS_ASSET"

export IDF_COMMIT

Expand Down Expand Up @@ -103,37 +130,25 @@ else
exit 1
fi

echo "IDF_COMMIT: $IDF_COMMIT"
echo "AR_BRANCH: $AR_BRANCH"
echo "AR_NEW_COMMIT_MESSAGE: $AR_NEW_COMMIT_MESSAGE"
echo "AR_NEW_BRANCH_NAME: $AR_NEW_BRANCH_NAME"
echo "AR_NEW_PR_TITLE: $AR_NEW_PR_TITLE"
echo "AR_HAS_COMMIT: $AR_HAS_COMMIT"
echo "AR_HAS_BRANCH: $AR_HAS_BRANCH"
echo "AR_HAS_PR: $AR_HAS_PR"
echo "LIBS_RELEASE_TAG: $LIBS_RELEASE_TAG"
echo "LIBS_VERSION: $LIBS_VERSION"
echo "LIBS_RELEASE_ID: $LIBS_RELEASE_ID"
echo "LIBS_HAS_RELEASE: $LIBS_HAS_RELEASE"
echo "LIBS_ASSET_ID: $LIBS_ASSET_ID"
echo "LIBS_HAS_ASSET: $LIBS_HAS_ASSET"
echo "DEPLOY_NEEDED: $DEPLOY_NEEDED"

if [ ! -x $GITHUB_OUTPUT ]; then
echo "idf_commit=$IDF_COMMIT" >> "$GITHUB_OUTPUT"
echo "ar_branch=$AR_BRANCH" >> "$GITHUB_OUTPUT"
echo "ar_new_commit_message=$AR_NEW_COMMIT_MESSAGE" >> "$GITHUB_OUTPUT"
echo "ar_new_branch_name=$AR_NEW_BRANCH_NAME" >> "$GITHUB_OUTPUT"
echo "ar_new_pr_title=$AR_NEW_PR_TITLE" >> "$GITHUB_OUTPUT"
echo "ar_has_commit=$AR_HAS_COMMIT" >> "$GITHUB_OUTPUT"
echo "ar_has_branch=$AR_HAS_BRANCH" >> "$GITHUB_OUTPUT"
echo "ar_has_pr=$AR_HAS_PR" >> "$GITHUB_OUTPUT"
echo "libs_release_tag=$LIBS_RELEASE_TAG" >> "$GITHUB_OUTPUT"
echo "libs_version=$LIBS_VERSION" >> "$GITHUB_OUTPUT"
echo "libs_release_id=$LIBS_RELEASE_ID" >> "$GITHUB_OUTPUT"
echo "libs_has_release=$LIBS_HAS_RELEASE" >> "$GITHUB_OUTPUT"
echo "libs_asset_id=$LIBS_ASSET_ID" >> "$GITHUB_OUTPUT"
echo "libs_has_asset=$LIBS_HAS_ASSET" >> "$GITHUB_OUTPUT"
echo "deploy_needed=$DEPLOY_NEEDED" >> "$GITHUB_OUTPUT"
if [ -n "$GITHUB_OUTPUT" ]; then
{
echo "idf_commit=$IDF_COMMIT"
echo "ar_branch=$AR_BRANCH"
echo "ar_new_commit_message=$AR_NEW_COMMIT_MESSAGE"
echo "ar_new_branch_name=$AR_NEW_BRANCH_NAME"
echo "ar_new_pr_title=$AR_NEW_PR_TITLE"
echo "ar_has_commit=$AR_HAS_COMMIT"
echo "ar_has_branch=$AR_HAS_BRANCH"
echo "ar_has_pr=$AR_HAS_PR"
echo "libs_release_tag=$LIBS_RELEASE_TAG"
echo "libs_version=$LIBS_VERSION"
echo "libs_release_id=$LIBS_RELEASE_ID"
echo "libs_has_release=$LIBS_HAS_RELEASE"
echo "libs_asset_id=$LIBS_ASSET_ID"
echo "libs_has_asset=$LIBS_HAS_ASSET"
echo "deploy_needed=$DEPLOY_NEEDED"
} >> "$GITHUB_OUTPUT"
fi

Loading