You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2021/08/12 06:25:50 UTC
[orc] branch branch-1.7 updated: ORC-941: Move `MacOS 10.15/11.5`
test from Travis to GitHub Action (#853)
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.7 by this push:
new 8e12377 ORC-941: Move `MacOS 10.15/11.5` test from Travis to GitHub Action (#853)
8e12377 is described below
commit 8e12377fe89adde4320216785eb7797c659fdecc
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Wed Aug 11 23:25:12 2021 -0700
ORC-941: Move `MacOS 10.15/11.5` test from Travis to GitHub Action (#853)
### What changes were proposed in this pull request?
This PR aims to migrate the following jobs from `Travis CI` to `GitHub Action`.
- Mac OS 10.15
- Mac OS 11.5
### Why are the changes needed?
This job takes 40-minutes execution time and waits in the queue over 6 hours frequently while GitHub Action jobs finish in around 20 minutes in total.
- https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md
- System Version: macOS 10.15.7 (19H1323)
- https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
- System Version: macOS 11.5 (20G71)
### How was this patch tested?
Pass the CIs.
(cherry picked from commit debc63ed15ab75cbb239cc136f9bdc0f13f3a926)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
.github/workflows/build_and_test.yml | 14 +++++++++++---
.travis.yml | 26 --------------------------
2 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index bbccdcf..f00fc5a 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -10,11 +10,15 @@ on:
jobs:
build:
- name: "Build with Java ${{ matrix.java }}"
- runs-on: ubuntu-20.04
+ name: "Build with Java ${{ matrix.java }} on ${{ matrix.os }}"
+ runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
+ os:
+ - ubuntu-20.04
+ - macos-10.15
+ - macos-11
java:
- 1.8
- 11
@@ -42,5 +46,9 @@ jobs:
mkdir -p ~/.m2
mkdir build
cd build
- cmake -DANALYZE_JAVA=ON ..
+ if [ "${{ matrix.os }}" = "ubuntu-20.04" ]; then
+ cmake -DANALYZE_JAVA=ON ..
+ else
+ cmake -DANALYZE_JAVA=ON -DOPENSSL_ROOT_DIR=`brew --prefix openssl` ..
+ fi
make package test-out
diff --git a/.travis.yml b/.travis.yml
index c29bcd9..976034f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,5 @@
sudo: false
dist: focal
-addons:
- homebrew:
- packages:
- - openssl
matrix:
fast_finish: true
@@ -24,28 +20,6 @@ matrix:
compiler: clang
os: linux
- - language: cpp
- compiler: clang
- os: osx
- osx_image: xcode11.3
- script:
- - brew link --overwrite --force openssl
- - mkdir build
- - cd build
- - cmake -DBUILD_JAVA=OFF -DOPENSSL_ROOT_DIR=`brew --prefix openssl` ..
- - travis_wait 35 make package test-out
-
- - language: cpp
- compiler: clang
- os: osx
- osx_image: xcode12
- script:
- - brew link --overwrite --force openssl
- - mkdir build
- - cd build
- - cmake -DBUILD_JAVA=OFF -DOPENSSL_ROOT_DIR=`brew --prefix openssl` ..
- - travis_wait 35 make package test-out
-
cache:
directories:
- $HOME/.m2