Skip to content

Update last green commit from master, stable or main branch and retrieve rules_nodejs .bazelci from stable branch.#1064

Merged
fweikert merged 6 commits intobazelbuild:masterfrom
comius:patch-1
Nov 18, 2020
Merged

Update last green commit from master, stable or main branch and retrieve rules_nodejs .bazelci from stable branch.#1064
fweikert merged 6 commits intobazelbuild:masterfrom
comius:patch-1

Conversation

@comius
Copy link
Copy Markdown
Contributor

@comius comius commented Nov 18, 2020

rules_nodejs stopped using master and switched to stable branch.
rules_pkg switched to main branch.

@comius comius changed the title Retrieve rules_nodejs .bazelci from stable branch. Update last green commit from master or stable branch and retrieve rules_nodejs .bazelci from stable branch. Nov 18, 2020
Comment thread buildkite/bazelci.py Outdated
is_pull_request()
or use_but
or os.getenv("BUILDKITE_BRANCH") != "master"
or (os.getenv("BUILDKITE_BRANCH") != "master" and os.getenv("BUILDKITE_BRANCH") != "stable")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're here, should be also add the check for main?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather wait for the first project to have it. This thing can produce problems if multiple branches are active.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Yeah, we have to be careful. Looks like rules_pkg has already switched to main - maybe that's a good enough reason?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is indeed. Done.

@comius comius changed the title Update last green commit from master or stable branch and retrieve rules_nodejs .bazelci from stable branch. Update last green commit from master, stable or main branch and retrieve rules_nodejs .bazelci from stable branch. Nov 18, 2020
Comment thread buildkite/bazelci.py Outdated
is_pull_request()
or use_but
or os.getenv("BUILDKITE_BRANCH") != "master"
or (os.getenv("BUILDKITE_BRANCH") != "master"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can merge all three conditions:
... or os.getenv("BUILDKITE_BRANCH) not in ("master", "main", "stable") or ...

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For clarity we should move it out of the first "not" clause, too.

Comment thread buildkite/bazelci.py Outdated
or (os.getenv("BUILDKITE_BRANCH") != "master"
and os.getenv("BUILDKITE_BRANCH") != "stable"
and os.getenv("BUILDKITE_BRANCH") != "main")
or os.getenv("BUILDKITE_BRANCH") not in ("master", "stable", "main")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for yet another late comment, but can you please get rid of the double negation?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, applied de-Morgan laws :)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done on the comment as well.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks!

@fweikert fweikert merged commit 23ce48d into bazelbuild:master Nov 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants