Slight build improvements (#675)

airbytehq · Oct 22, 2020 · d159571 · d159571
1 parent e75aa1e
commit d159571
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -7,8 +7,6 @@ on:
 
 jobs:
   build:
-    env:
-      GRADLE_PATH: /tmp/gradle
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Airbyte
@@ -17,7 +15,7 @@ jobs:
       - name: Cache java deps
         uses: actions/cache@v2
         with:
-          path: ${{ env.GRADLE_PATH }}
+          path: ~/.gradle
           key: gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             gradle-
@@ -45,17 +43,17 @@ jobs:
           STRIPE_INTEGRATION_TEST_CREDS: ${{ secrets.STRIPE_INTEGRATION_TEST_CREDS }}
 
       - name: Build
-        run: ./gradlew build --no-daemon -g ${{ env.GRADLE_PATH }}
+        run: ./gradlew --no-daemon build
 
       - name: Ensure no file change
         run: git status --porcelain && test -z "$(git status --porcelain)"
 
       - name: Run Integration Tests
-        run: ./gradlew integrationTest --no-daemon -g ${{ env.GRADLE_PATH }}
+        run: ./gradlew --no-daemon integrationTest
 
       - name: Build Core Docker Images
         if: success() && github.ref == 'refs/heads/master'
-        run: ./gradlew composeBuild --no-daemon -g ${{ env.GRADLE_PATH }}
+        run: ./gradlew --no-daemon composeBuild
         env:
           GIT_REVISION: ${{ github.sha }}
 

diff --git a/airbyte-webapp/build.gradle b/airbyte-webapp/build.gradle
@@ -27,6 +27,3 @@ task test(type: NpmTask) {
     inputs.file 'package-lock.json'
 }
 
-clean {
-    delete "${projectDir}/node_modules/"
-}
diff --git a/airbyte-workers/build.gradle b/airbyte-workers/build.gradle
@@ -11,7 +11,6 @@ dependencies {
 
     implementation project(':airbyte-config:models')
     implementation project(':airbyte-db')
-    implementation project(':airbyte-integrations')
     implementation project(':airbyte-json-validation')
     implementation project(':airbyte-protocol:models')
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,3 @@
 org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.vfs.watch=true
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,16 @@
+// Configure the gradle enterprise plugin to enable build scans. Enabling the plugin at the top of the settings file allows the build scan to record
+// as much information as possible.
+plugins {
+    id "com.gradle.enterprise" version "3.4.1"
+}
+
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = "https://gradle.com/terms-of-service"
+        termsOfServiceAgree = "yes"
+    }
+}
+
 import groovy.io.FileType
 
 rootProject.name = 'airbyte'
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,3 @@ task test(type: NpmTask) { @@
         inputs.file 'package-lock.json'
     }
-    clean {
-        delete "${projectDir}/node_modules/"
-    }