Skip to content

Fix integrity check#18871

Merged
alexey-milovidov merged 2 commits intoClickHouse:masterfrom
azat:fix-integrity-check
Jan 8, 2021
Merged

Fix integrity check#18871
alexey-milovidov merged 2 commits intoClickHouse:masterfrom
azat:fix-integrity-check

Conversation

@azat
Copy link
Copy Markdown
Member

@azat azat commented Jan 8, 2021

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

  • Do not run integrity check for cross compiled binaries
  • untrap setenv() call (used for timezone)

The reason that it wasn't pops up during testing PR #18811 on CI, because runs for PRs does not set YANDEX_OFFICIAL_BUILD, while runs for merged into upstream commits does.

P.S. this PR contains two separate patches, because I did not want to waste more CPU time on CI

Cc: @alexey-milovidov

Follow-up-for: #16366
Follow-up-for: #18811

azat added 2 commits January 8, 2021 15:26
This will also fix integrity check (ClickHouse#18811), the reason it does not pops
up on CI during PR testing because CI does not set
YANDEX_OFFICIAL_BUILD, while it does set it for commits merged into
upstream commits, and hence once it was merged the special build was
failed.

Follow-up for: ClickHouse#16366
@robot-clickhouse robot-clickhouse added the pr-not-for-changelog This PR should not be mentioned in the changelog label Jan 8, 2021
@alexey-milovidov alexey-milovidov self-assigned this Jan 8, 2021
@alexey-milovidov alexey-milovidov merged commit a55260f into ClickHouse:master Jan 8, 2021
@azat azat deleted the fix-integrity-check branch January 8, 2021 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr-not-for-changelog This PR should not be mentioned in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants