Skip to content

Conversation

@glozow
Copy link
Member

@glozow glozow commented May 5, 2021

I think there was a silent merge conflict between #21852 and #21740?

I have a linter failure:

File "ci/test/00_setup_env_native_fuzz_with_msan.sh" contains a shebang line, but has the file permission 644 instead of the expected executable permission 755. Do "chmod 755 ci/test/00_setup_env_native_fuzz_with_msan.sh" (or remove the shebang line).
ERROR: There were 1 failed tests in the lint-files.py lint test. Please resolve the above errors.
^---- failure generated from test/lint/lint-files.sh

@glozow
Copy link
Member Author

glozow commented May 5, 2021

cc @MarcoFalke
(Looks like the lint job passed, yay)

@maflcko
Copy link
Member

maflcko commented May 5, 2021

ACK d48565d

Thanks! 🚀

@maflcko maflcko merged commit f8575bc into bitcoin:master May 5, 2021
@glozow glozow deleted the 2021-05-lint branch May 5, 2021 19:08
@windsok
Copy link
Contributor

windsok commented May 5, 2021

Apologies for not noticing this. Thanks for fixing it.

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 5, 2021
…_msan.sh

d48565d fix permissions on 00_setup_env_native_fuzz_with_msan (glozow)

Pull request description:

  I think there was a silent merge conflict between bitcoin#21852 and bitcoin#21740?

  I have a [linter failure](https://cirrus-ci.com/task/5436849834426368):

  ```
  File "ci/test/00_setup_env_native_fuzz_with_msan.sh" contains a shebang line, but has the file permission 644 instead of the expected executable permission 755. Do "chmod 755 ci/test/00_setup_env_native_fuzz_with_msan.sh" (or remove the shebang line).
  ERROR: There were 1 failed tests in the lint-files.py lint test. Please resolve the above errors.
  ^---- failure generated from test/lint/lint-files.sh
  ```

ACKs for top commit:
  MarcoFalke:
    ACK d48565d

Tree-SHA512: 445bdd738faf007451f40bbcf360dd1fb4675e17a4c96546e6818c12e33dd336dadd95cf8d4b5f8df1d6ccfbc4bf5496864bb5528e416cea894857b6b732140c
gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 1, 2022
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants