Skip to content

Conversation

@connorjclark
Copy link
Collaborator

@connorjclark connorjclark commented Mar 18, 2022

Fixes the merge issue we were getting in devtools CI build step.

there was an issue with landing a new test file in devtools repo first

image

https://github.com/GoogleChrome/lighthouse/runs/5591661464?check_suite_focus=true#step:11:52

# For CI, only run if this was a cache-miss.
# The only way the folder already exists _and_ there is a cache-miss is
# if actions/cache@v2 `restore-keys` has provided a partial environment for us.
# Do the same as for local, but don't clean! That would toss out all the
Copy link
Collaborator Author

@connorjclark connorjclark Mar 18, 2022

Choose a reason for hiding this comment

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

avoiding clean only makes sense if we were doing -x. but without that flag git will not touch the ignored folders it knows about, which is where the build artifacts are.

# Locally, clean everything and update to latest code.
git reset --hard
git clean -fd
git pull --ff-only -f origin main
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

i know these two branches are the same but I don't care. do you really want to read a compound bash logic if? because I don't want to write one.

@connorjclark connorjclark marked this pull request as ready for review March 18, 2022 20:44
@connorjclark connorjclark requested a review from a team as a code owner March 18, 2022 20:44
@connorjclark connorjclark requested review from adamraine and removed request for a team March 18, 2022 20:44
Copy link
Contributor

@adamraine adamraine left a comment

Choose a reason for hiding this comment

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

Release me from this hell

@devtools-bot devtools-bot merged commit bd47795 into master Mar 18, 2022
@devtools-bot devtools-bot deleted the fix-dt-test-clean branch March 18, 2022 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants