You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2020/05/19 22:01:19 UTC
[arrow] branch master updated: ARROW-8848: [Ruby][CI] Fix MSYS2
update error
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 0906aa3 ARROW-8848: [Ruby][CI] Fix MSYS2 update error
0906aa3 is described below
commit 0906aa30d4278bca7d21b96391a75074046e3e13
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Wed May 20 07:00:59 2020 +0900
ARROW-8848: [Ruby][CI] Fix MSYS2 update error
We need to avoid updating both pacman and msys2-runtime at once.
Closes #7229 from kou/glib-ci-fix-msys2-update
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
.github/workflows/cpp.yml | 8 ++++----
.github/workflows/ruby.yml | 18 ++++++++++++++----
ci/scripts/msys2_system_upgrade.sh | 7 +++++++
3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index c933285..d9b9452 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -22,18 +22,18 @@ on:
paths:
- '.github/workflows/cpp.yml'
- 'ci/docker/**'
- - 'ci/scripts/util_*'
- - 'ci/scripts/msys_*'
- 'ci/scripts/cpp_*'
+ - 'ci/scripts/msys2_*'
+ - 'ci/scripts/util_*'
- 'cpp/**'
- 'format/Flight.proto'
pull_request:
paths:
- '.github/workflows/cpp.yml'
- 'ci/docker/**'
- - 'ci/scripts/util_*'
- - 'ci/scripts/msys_*'
- 'ci/scripts/cpp_*'
+ - 'ci/scripts/msys2_*'
+ - 'ci/scripts/util_*'
- 'cpp/**'
- 'format/Flight.proto'
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index facb9e8..3988c4d 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -21,16 +21,26 @@ on:
push:
paths:
- '.github/workflows/ruby.yml'
- - 'ci/**'
- - 'cpp/**'
+ - 'ci/docker/**'
+ - 'ci/scripts/c_glib_*'
+ - 'ci/scripts/cpp_*'
+ - 'ci/scripts/msys2_*'
+ - 'ci/scripts/ruby_*'
+ - 'ci/scripts/util_*'
- 'c_glib/**'
+ - 'cpp/**'
- 'ruby/**'
pull_request:
paths:
- '.github/workflows/ruby.yml'
- - 'ci/**'
- - 'cpp/**'
+ - 'ci/docker/**'
+ - 'ci/scripts/c_glib_*'
+ - 'ci/scripts/cpp_*'
+ - 'ci/scripts/msys2_*'
+ - 'ci/scripts/ruby_*'
+ - 'ci/scripts/util_*'
- 'c_glib/**'
+ - 'cpp/**'
- 'ruby/**'
env:
diff --git a/ci/scripts/msys2_system_upgrade.sh b/ci/scripts/msys2_system_upgrade.sh
index 2d7b153..7104b79 100755
--- a/ci/scripts/msys2_system_upgrade.sh
+++ b/ci/scripts/msys2_system_upgrade.sh
@@ -19,6 +19,13 @@
set -eux
+# Ensure using the latest pacman
+pacman \
+ --noconfirm \
+ --sync \
+ -yy \
+ pacman
+
pacman \
--noconfirm \
--sync \