From cbc188db7b29b1798776f4d82ffa7c06649ad197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 1 Apr 2020 19:38:53 +0200 Subject: [PATCH 1/3] [EXP] Set env variables from workflow files --- .github/workflows/cpp.yml | 2 ++ .github/workflows/cpp_cron.yml | 2 ++ .github/workflows/dev.yml | 4 ++++ .github/workflows/integration.yml | 4 ++++ .github/workflows/java.yml | 4 ++++ .github/workflows/java_jni.yml | 4 ++++ .github/workflows/js.yml | 4 ++++ .github/workflows/python.yml | 4 ++++ .github/workflows/python_cron.yml | 4 ++++ .github/workflows/r.yml | 4 ++++ .github/workflows/ruby.yml | 4 ++++ .github/workflows/rust.yml | 4 ++++ 12 files changed, 44 insertions(+) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 2e673b9db9ef9..fc32c9910159b 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -32,6 +32,8 @@ on: - 'format/Flight.proto' env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 ARROW_ENABLE_TIMING_TESTS: OFF jobs: diff --git a/.github/workflows/cpp_cron.yml b/.github/workflows/cpp_cron.yml index 318dd794b9300..5858922cd0520 100644 --- a/.github/workflows/cpp_cron.yml +++ b/.github/workflows/cpp_cron.yml @@ -30,6 +30,8 @@ on: 0 */12 * * * env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 ARROW_ENABLE_TIMING_TESTS: OFF jobs: diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 5919284363b51..2cb5968a81622 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -22,6 +22,10 @@ on: push: pull_request: +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: lint: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c0fc10ca8a3f8..2ee0e7c88a534 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -41,6 +41,10 @@ on: - 'java/**' - 'format/**' +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: conda-integration: diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index b1d43bfa46b7a..372671ed47f0f 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -35,6 +35,10 @@ on: - 'format/Flight.proto' - 'java/**' +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml index d855a69b667ab..40e6624c6fd05 100644 --- a/.github/workflows/java_jni.yml +++ b/.github/workflows/java_jni.yml @@ -31,6 +31,10 @@ on: - 'cpp/**' - 'java/**' +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index d0632bdb3d0c2..b9da85b2a448d 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -29,6 +29,10 @@ on: - 'ci/**' - 'js/**' +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 82418e92dce36..db7aad5e4f91b 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -31,6 +31,10 @@ on: - 'cpp/**' - 'python/**' +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: ubuntu: diff --git a/.github/workflows/python_cron.yml b/.github/workflows/python_cron.yml index 26c5cd7dbd5e9..dd78628ec4516 100644 --- a/.github/workflows/python_cron.yml +++ b/.github/workflows/python_cron.yml @@ -28,6 +28,10 @@ on: - cron: | 0 */12 * * * +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 5fe7fab9fcf86..3748699258abf 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -39,6 +39,10 @@ on: - 'cpp/**' - 'r/**' +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: ubuntu: name: AMD64 Ubuntu ${{ matrix.ubuntu }} R ${{ matrix.r }} diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index ff6b726f430c5..e0277f7fe34de 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -33,6 +33,10 @@ on: - 'c_glib/**' - 'ruby/**' +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: ubuntu: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3d474889dd673..d3cddf577f089 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,6 +35,10 @@ on: - 'rust/**' - 'format/Flight.proto' +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: From cf684e7afe03db871fe827a0e20be6d7c5461ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 1 Apr 2020 21:20:24 +0200 Subject: [PATCH 2/3] don't use buildkit only delegate to docker cli --- .github/workflows/cpp.yml | 2 +- .github/workflows/cpp_cron.yml | 2 +- .github/workflows/dev.yml | 2 +- .github/workflows/integration.yml | 2 +- .github/workflows/java.yml | 2 +- .github/workflows/java_jni.yml | 2 +- .github/workflows/js.yml | 2 +- .github/workflows/python.yml | 2 +- .github/workflows/python_cron.yml | 2 +- .github/workflows/r.yml | 2 +- .github/workflows/ruby.yml | 2 +- .github/workflows/rust.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index fc32c9910159b..6e8d825940601 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -32,7 +32,7 @@ on: - 'format/Flight.proto' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 ARROW_ENABLE_TIMING_TESTS: OFF diff --git a/.github/workflows/cpp_cron.yml b/.github/workflows/cpp_cron.yml index 5858922cd0520..bcd0607d02d2a 100644 --- a/.github/workflows/cpp_cron.yml +++ b/.github/workflows/cpp_cron.yml @@ -30,7 +30,7 @@ on: 0 */12 * * * env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 ARROW_ENABLE_TIMING_TESTS: OFF diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 2cb5968a81622..89b272142aa5d 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -23,7 +23,7 @@ on: pull_request: env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 2ee0e7c88a534..bcbd217901e6d 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -42,7 +42,7 @@ on: - 'format/**' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 372671ed47f0f..79e030f1b8c72 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -36,7 +36,7 @@ on: - 'java/**' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml index 40e6624c6fd05..c31670c135428 100644 --- a/.github/workflows/java_jni.yml +++ b/.github/workflows/java_jni.yml @@ -32,7 +32,7 @@ on: - 'java/**' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index b9da85b2a448d..ddebe5b234eaa 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -30,7 +30,7 @@ on: - 'js/**' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index db7aad5e4f91b..943c42e9c5f80 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -32,7 +32,7 @@ on: - 'python/**' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/python_cron.yml b/.github/workflows/python_cron.yml index dd78628ec4516..41c905497c98b 100644 --- a/.github/workflows/python_cron.yml +++ b/.github/workflows/python_cron.yml @@ -29,7 +29,7 @@ on: 0 */12 * * * env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 3748699258abf..d6b7b6490d744 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -40,7 +40,7 @@ on: - 'r/**' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index e0277f7fe34de..ef0df90cb1da7 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -34,7 +34,7 @@ on: - 'ruby/**' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d3cddf577f089..4341858556033 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -36,7 +36,7 @@ on: - 'format/Flight.proto' env: - DOCKER_BUILDKIT: 1 + DOCKER_BUILDKIT: 0 COMPOSE_DOCKER_CLI_BUILD: 1 jobs: From bed05fcc4b47dfbf64449bf51897cad213a21ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 2 Apr 2020 18:54:25 +0200 Subject: [PATCH 3/3] add to docker workflow --- .github/workflows/go.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 10ea200cb48cb..23ac7425f20d7 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -29,6 +29,10 @@ on: - 'ci/**' - 'go/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: