ARROW-17395: [CI][Conan] can't find grpc-proto/cci.20220627 package (apache#13864)

kou · web-flow · commit bc1a16cd0ece · 2022-08-15T15:54:40.000+09:00
https://github.com/ursacomputing/crossbow/runs/7783226405?check_suite_focus=true WARN: thrift/0.16.0: requirement openssl/1.1.1o overridden by arrow/10.0.0 to openssl/1.1.1q WARN: grpc/1.47.0: requirement openssl/1.1.1o overridden by arrow/10.0.0 to openssl/1.1.1q WARN: grpc-proto/cci.20220627: requirement googleapis/cci.20220711 overridden by grpc/1.47.0 to googleapis/cci.20220531 ERROR: Missing binary: grpc-proto/cci.20220627:a009d554471614a67005f24fdcb37541daece7cb grpc-proto/cci.20220627: WARN: Can't find a 'grpc-proto/cci.20220627' package for the specified settings, options and dependencies: - Settings: arch=x86_64, build_type=Release, compiler=gcc, compiler.libcxx=libstdc++, compiler.version=10, os=Linux - Options: fPIC=True, shared=False, googleapis:fPIC=True, googleapis:shared=False, protobuf:debug_suffix=True, protobuf:fPIC=True, protobuf:lite=False, protobuf:shared=False, protobuf:with_rtti=True, protobuf:with_zlib=True, zlib:fPIC=True, zlib:shared=False - Dependencies: protobuf/3.21.1, googleapis/cci.20220531 - Requirements: googleapis/cci.20220531, protobuf/3.21.1:37dd8aae630726607d9d4108fefd2f59c8f7e9db - Package ID: a009d554471614a67005f24fdcb37541daece7cb grpc-proto/cci is updated but grpc isn't updated yet. So we can't use grpc-proto/cci's pre-built binary. Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
diff --git a/ci/conan/merge_status.sh b/ci/conan/merge_status.sh
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-UPSTREAM_REVISION=232a32d832f9754b81dde348e8fd8ded37ad404b
+UPSTREAM_REVISION=d659daa941be8ea8d2b22e8802c61f15688c67d5
diff --git a/ci/conan/merge_upstream.sh b/ci/conan/merge_upstream.sh
@@ -37,7 +37,7 @@ git \
   diff \
   ${UPSTREAM_REVISION}..${UPSTREAM_HEAD} \
   recipes/arrow | \
-  (cd "${source_dir}" && patch -p3)
+  (cd "${source_dir}" && patch -p3 || :)
 
 sed \
   -i.bak \
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -205,11 +205,12 @@ tasks:
     ci: github
     template: docker-tests/github.linux.yml
     params:
+      # ARROW-17395: Enable this again when grpc is updated.
+      # -e ARROW_CONAN_WITH_FLIGHT_RPC=True
       flags: >-
         -e ARROW_CONAN_PARQUET=True
         -e ARROW_CONAN_WITH_BROTLI=True
         -e ARROW_CONAN_WITH_BZ2=True
-        -e ARROW_CONAN_WITH_FLIGHT_RPC=True
         -e ARROW_CONAN_WITH_GLOG=True
         -e ARROW_CONAN_WITH_JEMALLOC=True
         -e ARROW_CONAN_WITH_JSON=True
