Skip to content

build: remove unnecessary env.sh logic for circleci #23054

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.

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

Conversation

devversion
Copy link
Member

In the past, when the checkout_and_rebase command has
been ported from angular/angular to the components repo,
the env.sh w/ env-helper.inc.sh scripts have been integrated
too. The goal of these scripts is to setup the environment for
CircleCI in a CI-agnostic way. Since the only logic relying on
the env.sh file is the rebase-pr script, we can just
update the script (located in .circleci/) to point directly to the
CircleCI variables.

This is more readable and makes the CI less convoluted. Especially
since the env.sh script currently "intends" to perform duplicate work
like setting up the RBE/GCP token (does not work due to an incorrect
GCP decrypt key being used). A separate script is already invoked for this
using the *setup_bazel_rbe YAML macro.

Also the env.sh file currently referenced non-existent files like
bazel.linux.rc.

@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jun 23, 2021
@devversion devversion requested a review from josephperrott June 23, 2021 21:05
@devversion devversion marked this pull request as ready for review June 23, 2021 21:05
@devversion devversion requested a review from a team as a code owner June 23, 2021 21:05
@devversion devversion added merge safe target: patch This PR is targeted for the next patch release labels Jun 23, 2021
Copy link
Member

@crisbeto crisbeto left a comment

Choose a reason for hiding this comment

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

LGTM

@devversion devversion added the action: merge The PR is ready for merge by the caretaker label Jun 24, 2021
In the past, when the `checkout_and_rebase` command has
been ported from `angular/angular` to the components repo,
the `env.sh` w/ `env-helper.inc.sh` scripts have been integrated
too. The goal of these scripts is to setup the environment for
CircleCI in a CI-agnostic way. Since the only logic relying on
the `env.sh` file is the `rebase-pr` script, we can just
update the script (located in `.circleci/`) to point directly to the
CircleCI variables.

This is more readable and makes the CI less convoluted. Especially
since the `env.sh` script currently performs duplicate work like
settign up the RBE/GCP token. A separate script is already invoked
for this using the `*setup_bazel_rbe` YAML macro.
@devversion devversion force-pushed the build/cleanup-circleci-env-setup branch from edad6ed to 9e798f7 Compare June 24, 2021 15:49
@amysorto amysorto merged commit 8a28f15 into angular:master Jun 25, 2021
amysorto pushed a commit that referenced this pull request Jun 25, 2021
In the past, when the `checkout_and_rebase` command has
been ported from `angular/angular` to the components repo,
the `env.sh` w/ `env-helper.inc.sh` scripts have been integrated
too. The goal of these scripts is to setup the environment for
CircleCI in a CI-agnostic way. Since the only logic relying on
the `env.sh` file is the `rebase-pr` script, we can just
update the script (located in `.circleci/`) to point directly to the
CircleCI variables.

This is more readable and makes the CI less convoluted. Especially
since the `env.sh` script currently performs duplicate work like
settign up the RBE/GCP token. A separate script is already invoked
for this using the `*setup_bazel_rbe` YAML macro.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Jul 26, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants