Skip to content
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

Jump to bottom

devops: re-use firefox checkout for firefox-stable #6410

Merged
merged 1 commit into from
May 5, 2021
Merged

devops: re-use firefox checkout for firefox-stable #6410

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
8 changes: 5 additions & 3 deletions browser_patches/export.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then
CHECKOUT_PATH="${FF_CHECKOUT_PATH}"
FRIENDLY_CHECKOUT_PATH="<FF_CHECKOUT_PATH>"
fi
elif [[ ("$1" == "firefox-stable") ]]; then
FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox-stable/checkout";
CHECKOUT_PATH="$PWD/firefox-stable/checkout"
elif [[ ("$1" == "firefox-stable") || ("$1" == "ff-stable") ]]; then
# NOTE: firefox-stable re-uses firefox checkout.
FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout";
CHECKOUT_PATH="$PWD/firefox/checkout"

EXTRA_FOLDER_PW_PATH="$PWD/firefox-stable/juggler"
EXTRA_FOLDER_CHECKOUT_RELPATH="juggler"
EXPORT_PATH="$PWD/firefox-stable"
Expand Down
2 changes: 1 addition & 1 deletion browser_patches/firefox-stable/archive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then
cd "${FF_CHECKOUT_PATH}"
echo "WARNING: checkout path from FF_CHECKOUT_PATH env: ${FF_CHECKOUT_PATH}"
else
cd "checkout"
cd "../firefox/checkout"
fi

OBJ_FOLDER="obj-build-playwright"
Expand Down
2 changes: 1 addition & 1 deletion browser_patches/firefox-stable/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then
cd "${FF_CHECKOUT_PATH}"
echo "WARNING: checkout path from FF_CHECKOUT_PATH env: ${FF_CHECKOUT_PATH}"
else
cd "checkout"
cd "../firefox/checkout"
fi

rm -rf .mozconfig
Expand Down
2 changes: 1 addition & 1 deletion browser_patches/firefox-stable/clean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then
echo "WARNING: checkout path from FF_CHECKOUT_PATH env: ${FF_CHECKOUT_PATH}"
else
cd "$(dirname $0)"
cd "checkout"
cd "../firefox/checkout"
fi

OBJ_FOLDER="obj-build-playwright"
Expand Down
10 changes: 6 additions & 4 deletions browser_patches/prepare_checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,11 @@ elif [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then
CHECKOUT_PATH="${FF_CHECKOUT_PATH}"
FRIENDLY_CHECKOUT_PATH="<FF_CHECKOUT_PATH>"
fi
elif [[ ("$1" == "firefox-stable") ]]; then
FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox-stable/checkout";
CHECKOUT_PATH="$PWD/firefox-stable/checkout"
elif [[ ("$1" == "firefox-stable") || ("$1" == "ff-stable") ]]; then
# NOTE: firefox-stable re-uses firefox checkout.
FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout";
CHECKOUT_PATH="$PWD/firefox/checkout"

PATCHES_PATH="$PWD/firefox-stable/patches"
FIREFOX_EXTRA_FOLDER_PATH="$PWD/firefox-stable/juggler"
BUILD_NUMBER=$(head -1 "$PWD/firefox-stable/BUILD_NUMBER")
Expand Down Expand Up @@ -236,7 +238,7 @@ elif [[ ! -z "${FIREFOX_EXTRA_FOLDER_PATH}" ]]; then
git add $EMBEDDER_DIR
fi

git commit -a --author="playwright-devops <devops@playwright.dev>" -m "chore: bootstrap build #$BUILD_NUMBER"
git commit -a --author="playwright-devops <devops@playwright.dev>" -m "chore($1): bootstrap build #$BUILD_NUMBER"

echo
echo
Expand Down