Skip to content

[CI] Add dev/coverage into backport script #13987

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
jsoriano merged 4 commits into from
May 23, 2025
Merged

[CI] Add dev/coverage into backport script #13987

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f7f2ae
Add dev/coverage into backport script
mrodm May 23, 2025
37ece11
Show just relevant diff
mrodm May 23, 2025
f6e236f
Remove ci folder
mrodm May 23, 2025
0e6f7cd
Add messages
mrodm May 23, 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
8 changes: 7 additions & 1 deletion .buildkite/scripts/backport_branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,15 @@ updateBackportBranchContents() {
# Update scripts used by mage
local MAGEFILE_SCRIPTS_FOLDER="dev/citools"
local TESTSREPORTER_SCRIPTS_FOLDER="dev/testsreporter"
local COVERAGE_SCRIPTS_FOLDER="dev/coverage"
if git ls-tree -d --name-only main:${MAGEFILE_SCRIPTS_FOLDER} > /dev/null 2>&1 ; then
echo "Copying $MAGEFILE_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
git checkout "$SOURCE_BRANCH" -- "${MAGEFILE_SCRIPTS_FOLDER}"
echo "Copying $TESTSREPORTER_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
git checkout "$SOURCE_BRANCH" -- "${TESTSREPORTER_SCRIPTS_FOLDER}"
echo "Copying $COVERAGE_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
git checkout "$SOURCE_BRANCH" -- "${COVERAGE_SCRIPTS_FOLDER}"
echo "Copying magefile.go from $SOURCE_BRANCH..."
git checkout "$SOURCE_BRANCH" -- "magefile.go"
# Run go mod tidy to update just the dependencies related to magefile and dev scripts
go mod tidy
Expand Down Expand Up @@ -173,7 +178,8 @@ updateBackportBranchContents() {

if [ "$DRY_RUN" == "true" ];then
echo "DRY_RUN mode, nothing will be pushed."
git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME
# Show just the relevant files diff (go.mod, go.sum, .buildkite, dev and package to be backported)
git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME go.mod go.sum .buildkite/ dev/ "packages/${PACKAGE_NAME}"
else
echo "Pushing..."
git push origin $BACKPORT_BRANCH_NAME
Expand Down