Skip to content

Enhancing stable and current workflows for custom cli branch input #401

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Enhancing stable and current workflows for custom cli branch input #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0806a30
Add custom CLI branch input to amd8 workflow
hayee-bhatti Oct 1, 2025
a7f80e2
Adding custom CLI input in the remaining workflows
hayee-bhatti Oct 6, 2025
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
26 changes: 24 additions & 2 deletions .github/workflows/current-amd8-daily-build-devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ on:
- main
- v25_STABLE
- REL24_10
- custom

custom_cli_branch:
description: "If 'custom' selected above, provide cli branch name"
required: false
type: string

component:
description: "Spock in-dev component to additionally build (e.g. spock60)"
Expand Down Expand Up @@ -116,7 +122,20 @@ jobs:
echo "Clean flag is disabled"
fi

SELECTED_CLI_BRANCH="${{ inputs.cli_branch }}"
# If custom cli branch is chosen, set the branch provided in text field (cannot be empty)
# otherwise set it to selection from the drop down.
if [[ "${{ inputs.cli_branch }}" == "custom" ]]; then
if [[ -z "${{ inputs.custom_cli_branch }}" ]]; then
echo "Error: custom CLI branch selected but no branch name provided."
exit 1
fi
SELECTED_CLI_BRANCH="${{ inputs.custom_cli_branch }}"
echo "Manual run: Using custom CLI branch: $SELECTED_CLI_BRANCH"
else
SELECTED_CLI_BRANCH="${{ inputs.cli_branch }}"
echo "Manual run: Using CLI branch: $SELECTED_CLI_BRANCH"
fi

COMPONENT="${{ inputs.component }}"
BRANCH="${{ inputs.branch }}"
echo "Manual run: Component=$COMPONENT, Branch=$BRANCH, CLI Branch=$SELECTED_CLI_BRANCH"
Expand Down Expand Up @@ -175,7 +194,10 @@ jobs:
git stash push -u -m "Temp stash for current build" || true

echo "Switching to branch: $CLI_BRANCH"
git checkout "$CLI_BRANCH" || true
if ! git checkout "$CLI_BRANCH"; then
echo "Error: Invalid CLI branch name provided: $CLI_BRANCH"
exit 1
fi
echo "Branch checkout completed"

# Execute the build script and collect artifacts into src/ and bin/
Expand Down
26 changes: 24 additions & 2 deletions .github/workflows/current-arm9-daily-build-devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ on:
- main
- v25_STABLE
- REL24_10
- custom

custom_cli_branch:
description: "If 'custom' selected above, provide cli branch name"
required: false
type: string

component:
description: "Spock in-dev component to additionally build (e.g. spock60)"
Expand Down Expand Up @@ -116,7 +122,20 @@ jobs:
echo "Clean flag is disabled"
fi

SELECTED_CLI_BRANCH="${{ inputs.cli_branch }}"
# If custom cli branch is chosen, set the branch provided in text field (cannot be empty)
# otherwise set it to selection from the drop down.
if [[ "${{ inputs.cli_branch }}" == "custom" ]]; then
if [[ -z "${{ inputs.custom_cli_branch }}" ]]; then
echo "Error: custom CLI branch selected but no branch name provided."
exit 1
fi
SELECTED_CLI_BRANCH="${{ inputs.custom_cli_branch }}"
echo "Manual run: Using custom CLI branch: $SELECTED_CLI_BRANCH"
else
SELECTED_CLI_BRANCH="${{ inputs.cli_branch }}"
echo "Manual run: Using CLI branch: $SELECTED_CLI_BRANCH"
fi

COMPONENT="${{ inputs.component }}"
BRANCH="${{ inputs.branch }}"
echo "Manual run: Component=$COMPONENT, Branch=$BRANCH, CLI Branch=$SELECTED_CLI_BRANCH"
Expand Down Expand Up @@ -175,7 +194,10 @@ jobs:
git stash push -u -m "Temp stash for current build" || true

echo "Switching to branch: $CLI_BRANCH"
git checkout "$CLI_BRANCH" || true
if ! git checkout "$CLI_BRANCH"; then
echo "Error: Invalid CLI branch name provided: $CLI_BRANCH"
exit 1
fi
echo "Branch checkout completed"

# Execute the build script and collect artifacts into src/ and bin/
Expand Down
27 changes: 23 additions & 4 deletions .github/workflows/stable-amd8-daily-build-devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ on:
- v25_STABLE
- main
- REL24_10
- custom

custom_cli_branch:
description: "If 'custom' selected above, provide cli branch name"
required: false
type: string

prefix_selector:
description: "Choose target pgedge-devel repo sub-directory (default = MMDD, custom = your input). Packages will be at: https://pgedge-devel.s3.amazonaws.com/REPO/stable/<sub-dir>"
Expand Down Expand Up @@ -91,8 +97,17 @@ jobs:
fi

# Branch input
SELECTED_CLI_BRANCH="${{ inputs.cli_branch }}"
echo "Manual run: Selected CLI branch: $SELECTED_CLI_BRANCH"
if [[ "${{ inputs.cli_branch }}" == "custom" ]]; then
if [[ -z "${{ inputs.custom_cli_branch }}" ]]; then
echo "Error: 'custom' CLI branch selected but no branch name provided."
exit 1
fi
SELECTED_CLI_BRANCH="${{ inputs.custom_cli_branch }}"
echo "Manual run: Using custom CLI branch: $SELECTED_CLI_BRANCH"
else
SELECTED_CLI_BRANCH="${{ inputs.cli_branch }}"
echo "Manual run: Using predefined CLI branch: $SELECTED_CLI_BRANCH"
fi
fi

# Set timestamped log file
Expand Down Expand Up @@ -136,8 +151,12 @@ jobs:
echo "Stashing changes (if any)..."
git stash push -u -m "Temp stash for branch switch" || true

echo "Checking out branch: $CLI_BRANCH"
git checkout "$CLI_BRANCH" || true
echo "Switching to branch: $CLI_BRANCH"
if ! git checkout "$CLI_BRANCH"; then
echo "Error: Invalid CLI branch name provided: $CLI_BRANCH"
exit 1
fi
echo "Branch checkout completed"

- name: Run build and push to devel repo
id: build_to_devel
Expand Down
27 changes: 23 additions & 4 deletions .github/workflows/stable-arm9-daily-build-devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ on:
- v25_STABLE
- main
- REL24_10
- custom

custom_cli_branch:
description: "If 'custom' selected above, provide cli branch name"
required: false
type: string

prefix_selector:
description: "Choose target pgedge-devel repo sub-directory (default = MMDD, custom = your input). Packages will be at: https://pgedge-devel.s3.amazonaws.com/REPO/stable/<sub-dir>"
Expand Down Expand Up @@ -91,8 +97,17 @@ jobs:
fi

# Branch input
SELECTED_CLI_BRANCH="${{ inputs.cli_branch }}"
echo "Manual run: Selected CLI branch: $SELECTED_CLI_BRANCH"
if [[ "${{ inputs.cli_branch }}" == "custom" ]]; then
if [[ -z "${{ inputs.custom_cli_branch }}" ]]; then
echo "Error: 'custom' CLI branch selected but no branch name provided."
exit 1
fi
SELECTED_CLI_BRANCH="${{ inputs.custom_cli_branch }}"
echo "Manual run: Using custom CLI branch: $SELECTED_CLI_BRANCH"
else
SELECTED_CLI_BRANCH="${{ inputs.cli_branch }}"
echo "Manual run: Using predefined CLI branch: $SELECTED_CLI_BRANCH"
fi
fi

# Set timestamped log file
Expand Down Expand Up @@ -136,8 +151,12 @@ jobs:
echo "Stashing changes (if any)..."
git stash push -u -m "Temp stash for branch switch" || true

echo "Checking out branch: $CLI_BRANCH"
git checkout "$CLI_BRANCH" || true
echo "Switching to branch: $CLI_BRANCH"
if ! git checkout "$CLI_BRANCH"; then
echo "Error: Invalid CLI branch name provided: $CLI_BRANCH"
exit 1
fi
echo "Branch checkout completed"

- name: Run build and push to devel repo
id: build_to_devel
Expand Down
Loading