Skip to content

Commit

Permalink
Build: make sure lock is created in integration specs (#14302)
Browse files Browse the repository at this point in the history
without these changes doing (an in-process) `bundle install`
did not generate a Gemfile.lock

this is than problematic, when using git sourced gem (locally) those gems do not not get resolved properly with the *qa/integration/rspec.rb* script
  • Loading branch information
kares authored Jun 28, 2022
1 parent 3b218a3 commit f073529
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ tasks.register("installBundler") {
}
}

tasks.register("bootstrap"){
tasks.register("bootstrap") {
dependsOn installBundler
doLast {
setupJruby(projectDir, buildDir)
Expand Down Expand Up @@ -428,7 +428,8 @@ tasks.register("installIntegrationTestBundler"){

tasks.register("installIntegrationTestGems") {
dependsOn installIntegrationTestBundler
inputs.files file("${projectDir}/qa/integration/Gemfile")
def gemfilePath = file("${projectDir}/qa/integration/Gemfile")
inputs.files gemfilePath
inputs.files file("${projectDir}/qa/integration/integration_tests.gemspec")
inputs.files file("${logstashBuildDir}/Gemfile")
inputs.files file("${logstashBuildDir}/Gemfile.lock")
Expand All @@ -438,7 +439,7 @@ tasks.register("installIntegrationTestGems") {
doLast {
bundleWithEnv(
projectDir, buildDir,
qaBuildPath, qaBundleBin, ['install', '--path', qaVendorPath],
qaBuildPath, qaBundleBin, ['install', '--path', qaVendorPath, '--gemfile', gemfilePath],
[ GEM_PATH: qaBundledGemPath, GEM_HOME: qaBundledGemPath ]
)
}
Expand Down

0 comments on commit f073529

Please sign in to comment.