Merge remote-tracking branch 'upstream/master'

Author: sdwr98

.gitignore

@@ -9,3 +9,4 @@ target
 /out
 dummy
 $buildDir
+src/main/idls/*

build.gradle

@@ -69,7 +69,19 @@ license {
     exclude 'com/uber/cadence/*.java' // generated code
 }
 
+task initDlsSubmodule(type: Exec) {
+    description = 'Initializes src/main/idls submodule'
+    commandLine 'git', 'submodule', 'init'
+}
+
+task updateDlsSubmodule(type: Exec) {
+    dependsOn initDlsSubmodule
+    description = 'Updates src/main/idls submodule'
+    commandLine 'git', 'submodule', 'update'
+}
+
 compileThrift {
+    dependsOn updateDlsSubmodule
     sourceItems "src/main/idls/thrift/cadence.thrift","src/main/idls/thrift/shared.thrift"
 
     nowarn true

docker/buildkite/Dockerfile

@@ -5,6 +5,8 @@ ENV APACHE_THRIFT_VERSION=0.9.3
 
 # Install dependencies using apk
 RUN apk update && apk add --virtual wget ca-certificates wget && apk add --virtual build-dependencies build-base gcc
+# Git is needed in order to update the dls submodule
+RUN apk add --virtual git
 
 # Compile source
 RUN set -ex ;\