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.

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

ci: Make sure conditions work for all platforms #2974

Merged
merged 1 commit into from
Aug 11, 2020

Conversation

kakkoyun
Copy link
Member

@kakkoyun kakkoyun commented Aug 4, 2020

Signed-off-by: Kemal Akkoyun [email protected]

Fixes for https://github.com/thanos-io/thanos/pull/2969/files#r464896752

  • Change is not relevant to the end user.

Changes

  • Fix issue with partial matches

Verification

  • make proto
  • make docs
  • make web-pre-process
  • make assets

@kakkoyun kakkoyun requested a review from GiedriusS August 4, 2020 09:05
Copy link
Member

@GiedriusS GiedriusS left a comment

Choose a reason for hiding this comment

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

Even though the shell scripts themselves work but I believe that these checks do not do what they are supposed to because they will match scripts/build-react-app.sh being anywhere in $0. Instead, I propose using something like:

[[ $(git rev-parse --show-toplevel 2>/dev/null) == "$PWD" ]]

WDYT, @kakkoyun ?

@kakkoyun
Copy link
Member Author

kakkoyun commented Aug 6, 2020

@GiedriusS Could you have another look at it? Is this what you meant?

@kakkoyun kakkoyun requested a review from GiedriusS August 6, 2020 05:49
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

I trust you ;p

@kakkoyun
Copy link
Member Author

@bwplotka Don't trust me on shell scripts, it's too platform dependant. I have run these on Debian-based environments as well. Everything works.

@kakkoyun kakkoyun merged commit d640a1a into thanos-io:master Aug 11, 2020
@kakkoyun kakkoyun deleted the shell_fix branch August 11, 2020 07:05
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