-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Isolate our build so that the feedback loop is faster #23411
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
aa12572
Isolate our build so that the feedback loop is faster
maxi297 5993960
Improve gradle build condition
maxi297 b244bfc
Update documentation
maxi297 37e5260
Merge branch 'master' into maxi297/isolate-build
maxi297 05ab65b
Adding auto-commit of formatting changes (as https://github.com/airby…
maxi297 90ea5a6
Merge branch 'master' into maxi297/isolate-build
maxi297 3e1f460
Merge branch 'master' into maxi297/isolate-build
maxi297 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -65,31 +65,43 @@ dependencyResolutionManagement { | |
} | ||
} | ||
|
||
// SUB_BUILD is an enum of <blank>, PLATFORM, CONNECTORS_BASE, ALL_CONNECTORS and OCTAVIA_CLI. Blank is equivalent to all. | ||
// SUB_BUILD is an enum of <blank>, PLATFORM, CONNECTORS_BASE, CDK, ALL_CONNECTORS and OCTAVIA_CLI. Blank is equivalent to all. | ||
if (!System.getenv().containsKey("SUB_BUILD")) { | ||
println("Building all of Airbyte.") | ||
} else { | ||
def subBuild = System.getenv().get("SUB_BUILD") | ||
println("Building Airbyte Sub Build: " + subBuild) | ||
if (subBuild != "CONNECTORS_BASE" && subBuild != "ALL_CONNECTORS" && subBuild != "OCTAVIA_CLI") { | ||
throw new IllegalArgumentException(String.format("%s is invalid. Must be unset or CONNECTORS_BASE, ALL_CONNECTORS or OCTAVIA_CLI", subBuild)) | ||
if (subBuild != "CONNECTORS_BASE" && subBuild != "ALL_CONNECTORS" && subBuild != "OCTAVIA_CLI" && subBuild != "CDK") { | ||
throw new IllegalArgumentException(String.format("%s is invalid. Must be unset or CONNECTORS_BASE, CDK, ALL_CONNECTORS or OCTAVIA_CLI", subBuild)) | ||
} | ||
} | ||
|
||
// shared | ||
include ':airbyte-commons' | ||
include ':airbyte-api' | ||
include ':airbyte-commons-cli' | ||
include ':airbyte-commons-protocol' | ||
include ':airbyte-config:specs' | ||
include ':airbyte-config:init' | ||
include ':airbyte-config:config-models' // reused by acceptance tests in connector base. | ||
include ':airbyte-db:db-lib' // reused by acceptance tests in connector base. | ||
include ':airbyte-json-validation' | ||
include ':airbyte-test-utils' | ||
|
||
// airbyte-workers has a lot of dependencies. | ||
include ':airbyte-connector-test-harnesses:acceptance-test-harness' | ||
if (!System.getenv().containsKey("SUB_BUILD") || System.getenv().get("SUB_BUILD") == "CDK" || System.getenv().get("SUB_BUILD") == "ALL_CONNECTORS") { | ||
include ':airbyte-commons' // this wouldn't be necessary if it wasn't from https://github.com/airbytehq/airbyte/blob/645558b74aab0b91fda1b4628b37b7095d92b4cc/build.gradle | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems very odd but I didn't want to investigate this since the build is still somewhat fast compared to before. Note that this seems like another improvement we could do though |
||
include ':tools:code-generator:airbyteDocker' | ||
include ':airbyte-cdk:python' | ||
} | ||
|
||
if (!System.getenv().containsKey("SUB_BUILD") || (System.getenv().containsKey("SUB_BUILD") && System.getenv().get("SUB_BUILD") != "CDK")) { | ||
// shared | ||
include ':airbyte-commons' | ||
include ':airbyte-api' | ||
include ':airbyte-commons-cli' | ||
include ':airbyte-commons-protocol' | ||
include ':airbyte-config:specs' | ||
include ':airbyte-config:init' | ||
include ':airbyte-config:config-models' // reused by acceptance tests in connector base. | ||
include ':airbyte-db:db-lib' // reused by acceptance tests in connector base. | ||
include ':airbyte-json-validation' | ||
include ':airbyte-test-utils' | ||
|
||
// airbyte-workers has a lot of dependencies. | ||
include ':airbyte-commons-worker' | ||
include ':airbyte-config:config-persistence' // transitively used by airbyte-workers. | ||
include ':airbyte-db:jooq' // transitively used by airbyte-workers. | ||
include ':airbyte-persistence:job-persistence' // transitively used by airbyte-workers. | ||
include ':airbyte-connector-test-harnesses:acceptance-test-harness' | ||
} | ||
|
||
// connectors base | ||
if (!System.getenv().containsKey("SUB_BUILD") || System.getenv().get("SUB_BUILD") == "CONNECTORS_BASE" || System.getenv().get("SUB_BUILD") == "ALL_CONNECTORS") { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Connectors Base: Build" was adding "Install Pyenv" (introduced here) but it's not so clear to me why we would need this