Skip to content

Remove branch references from .gitmodules#53763

Merged
rschu1ze merged 1 commit intoClickHouse:masterfrom
rschu1ze:branch-references
Aug 29, 2023
Merged

Remove branch references from .gitmodules#53763
rschu1ze merged 1 commit intoClickHouse:masterfrom
rschu1ze:branch-references

Conversation

@rschu1ze
Copy link
Copy Markdown
Member

@rschu1ze rschu1ze commented Aug 23, 2023

Branch references become outdated too easily and they mostly spread confusion (see the discussion in ClickHouse/arrow#40).

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

@rschu1ze
Remove branch references from .gitmodules
3e81018 
Branch references becomes outdated too easily and they mostly spread
confusion (see the discussion in ClickHouse/arrow#40).
@rschu1ze rschu1ze mentioned this pull request Aug 23, 2023
Closed
@robot-clickhouse robot-clickhouse added the pr-not-for-changelog This PR should not be mentioned in the changelog label Aug 23, 2023
@robot-clickhouse
Copy link
Copy Markdown
Member

robot-clickhouse commented Aug 23, 2023 •
edited by robot-clickhouse-ci-2
Loading

This is an automated comment for commit 3e81018 with description of existing statuses. It's updated for the latest CI running
The full report is available here
The overall status of the commit is 🔴 failure

Check nameDescriptionStatus
AST fuzzerRuns randomly generated queries to catch program errors. The build type is optionally given in parenthesis. If it fails, ask a maintainer for help🟢 success
CI runningA meta-check that indicates the running CI. Normally, it's in success or pending state. The failed status indicates some problems with the PR🟢 success
ClickHouse build checkBuilds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The cmake options can be found in the build log, grepping for cmake. Use these options and follow the general build process🟢 success
Compatibility checkChecks that clickhouse binary runs on distributions with old libc versions. If it fails, ask a maintainer for help🟢 success
Docker image for serversThe check to build and optionally push the mentioned image to docker hub🟢 success
Fast testNormally this is the first check that is ran for a PR. It builds ClickHouse and runs most of stateless functional tests, omitting some. If it fails, further checks are not started until it is fixed. Look at the report to see which tests fail, then reproduce the failure locally as described here🟢 success
Flaky testsChecks if new added or modified tests are flaky by running them repeatedly, in parallel, with more randomization. Functional tests are run 100 times with address sanitizer, and additional randomization of thread scheduling. Integrational tests are run up to 10 times. If at least once a new test has failed, or was too long, this check will be red. We don't allow flaky tests, read the doc🟢 success
Install packagesChecks that the built packages are installable in a clear environment🟢 success
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests🟢 success
Mergeable CheckChecks if all other necessary checks are successful🟢 success
Performance ComparisonMeasure changes in query performance. The performance test report is described in detail here. In square brackets are the optional part/total tests🟢 success
Push to DockerhubThe check for building and pushing the CI related docker images to docker hub🟢 success
SQLTestThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS🟢 success
SQLancerFuzzing tests that detect logical bugs with SQLancer tool🟢 success
SqllogicRun clickhouse on the sqllogic test set against sqlite and checks that all statements are passed🟢 success
Stateful testsRuns stateful functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc🟢 success
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc🔴 failure
Stress testRuns stateless functional tests concurrently from several clients to detect concurrency-related errors🟢 success
Style CheckRuns a set of checks to keep the code style clean. If some of tests failed, see the related log from the report🟢 success
Unit testsRuns the unit tests for different release types🟢 success
Upgrade checkRuns stress tests on server version from last release and then tries to upgrade it to the version from the PR. It checks if the new server can successfully startup without any errors, crashes or sanitizer asserts🔴 failure

@yakov-olkhovskiy
Copy link
Copy Markdown
Member

yakov-olkhovskiy commented Aug 29, 2023

@rschu1ze I don't quite get it - aren't we dependent on which submodule's branch we are using? wasn't it intended?

@yakov-olkhovskiy yakov-olkhovskiy self-assigned this Aug 29, 2023
@rschu1ze
Copy link
Copy Markdown
Member Author

rschu1ze commented Aug 29, 2023

@yakov-olkhovskiy See here for a detailed description of branch = in .gitmodules. It makes submodule updates a bit more convenient but it does NOT specify the actually tracked submodule branch/tag/commit. And this is where the confusion sets in for the average git user (besides that only a minority of submodules in .gitmodules have branch= specified). The best way to avoid this confusion is to not use branch= at all.

@rschu1ze rschu1ze merged commit 342c78b into ClickHouse:master Aug 29, 2023
@rschu1ze rschu1ze mentioned this pull request Oct 26, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yakov-olkhovskiy yakov-olkhovskiy yakov-olkhovskiy approved these changes

Assignees

@yakov-olkhovskiy yakov-olkhovskiy

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rschu1ze @robot-clickhouse @yakov-olkhovskiy