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

Fix CI on o1js-main branch #14429

Merged
merged 4 commits into from
Oct 25, 2023
Merged

Fix CI on o1js-main branch #14429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a67eb26
add exception for o1js to merges-cleanly job
mitschabaude Oct 25, 2023
8d431fa
add o1js-main branch case in snark-transaction-profiler-script
dkijania Oct 25, 2023
dcdd889
try something else
mitschabaude Oct 25, 2023
182f410
this looks promising
mitschabaude Oct 25, 2023
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/merges-cleanly.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

BRANCH=$1
CURRENT=$(git branch --show-current)
echo 'Testing for conflicts between the current branch `'"${CURRENT}"'` and `'"${BRANCH}"'`...'
echo 'Testing for conflicts between the current branch `'"${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"'` and `'"${BRANCH}"'`...'

# Adapted from this stackoverflow answer: https://stackoverflow.com/a/10856937
# The git merge-tree command shows the content of a 3-way merge without
Expand Down Expand Up @@ -32,6 +32,12 @@ if [ $RET -eq 0 ]; then
echo "No conflicts found against upstream branch ${BRANCH}"
exit 0
else
# exclude branches for which merging cleanly is not a hard requirement
if [ "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" == "o1js-main" ]; then
echo "Conflicts were found, but the current branch does not have to merge cleanly. Exiting with code 0."
exit 0
fi

# Found a conflict
echo "[ERROR] This pull request conflicts with $BRANCH, please open a new pull request against $BRANCH at this link:"
echo "https://github.com/MinaProtocol/mina/compare/${BRANCH}...${BUILDKITE_BRANCH}"
Expand Down
3 changes: 1 addition & 2 deletions buildkite/scripts/run-snark-transaction-profiler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ apt-get update
apt-get install -y git apt-transport-https ca-certificates tzdata curl python3

case "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" in
rampup|berkeley|release/2.0.0|develop)
rampup|berkeley|release/2.0.0|develop|o1js-main)
TESTNET_NAME="berkeley"
;;
*)
TESTNET_NAME="mainnet"
esac

git config --global --add safe.directory /workdir

source buildkite/scripts/export-git-env-vars.sh

echo "Installing mina daemon package: mina-${TESTNET_NAME}=${MINA_DEB_VERSION}"
Expand Down
3 changes: 2 additions & 1 deletion buildkite/src/Constants/DebianVersions.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ let minimalDirtyWhen = [
S.strictlyStart (S.contains "dockerfiles/stages"),
S.exactly "scripts/rebuild-deb" "sh",
S.exactly "scripts/release-docker" "sh",
S.exactly "buildkite/scripts/build-artifact" "sh"
S.exactly "buildkite/scripts/build-artifact" "sh",
S.exactly "buildkite/scripts/run-snark-transaction-profiler" "sh"
]

-- The default debian version (Bullseye) is used in all downstream CI jobs
Expand Down
Loading