From 2a2d7c378b8faa96b2a420a12b7745af9c827d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 31 Jan 2020 19:15:14 +0100 Subject: [PATCH 1/9] deploy using crossbow --- dev/tasks/gandiva-jars/travis.osx.yml | 42 ++++++++++++++------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index 5626b1b795d..34c6c6d489d 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -37,30 +37,32 @@ before_script: - git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} - if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi - - export TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR/arrow - - brew update - - brew install bison flex llvm@7 - - brew tap adoptopenjdk/openjdk - - brew cask install adoptopenjdk8 - - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home - - export PATH="$JAVA_HOME/bin:$PATH" - - echo $JAVA_HOME - - which java + # - export TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR/arrow + # - brew update + # - brew install bison flex llvm@7 + # - brew tap adoptopenjdk/openjdk + # - brew cask install adoptopenjdk8 + # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home + # - export PATH="$JAVA_HOME/bin:$PATH" + # - echo $JAVA_HOME + # - which java script: - cd arrow - mkdir -p dist - - dev/tasks/gandiva-jars/build-cpp-osx.sh || travis_terminate 1 - - dev/tasks/gandiva-jars/build-java.sh || travis_terminate 1 - -deploy: - provider: releases - api_key: $CROSSBOW_GITHUB_TOKEN - file_glob: true - file: dist/*.jar - skip_cleanup: true - on: - tags: true + # - dev/tasks/gandiva-jars/build-cpp-osx.sh || travis_terminate 1 + # - dev/tasks/gandiva-jars/build-java.sh || travis_terminate 1 + - echo "gandiva" > dist/test.jar + # deploy using crossbow + - brew install libgit2 python3 + - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz + - python arrow/dev/tasks/crossbow.py \ + --queue-path . \ + --queue-remote {{ queue.remote_url }} \ + upload-artifacts \ + --sha {{ task.branch }} \ + --tag {{ task.tag }} \ + --pattern "dist/*.jar" notifications: email: From 6929f3d2c703059e7cae357177afffe03d9ea32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 31 Jan 2020 19:21:30 +0100 Subject: [PATCH 2/9] fix crossbow path --- dev/tasks/gandiva-jars/travis.osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index 34c6c6d489d..a07182ca101 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -56,7 +56,7 @@ script: # deploy using crossbow - brew install libgit2 python3 - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz - - python arrow/dev/tasks/crossbow.py \ + - python3 dev/tasks/crossbow.py \ --queue-path . \ --queue-remote {{ queue.remote_url }} \ upload-artifacts \ From 7b054ecabf129ea267de675b5ee13f18b8c9c7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 31 Jan 2020 19:29:00 +0100 Subject: [PATCH 3/9] queue path --- dev/tasks/gandiva-jars/travis.osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index a07182ca101..877f2059987 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -57,7 +57,7 @@ script: - brew install libgit2 python3 - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz - python3 dev/tasks/crossbow.py \ - --queue-path . \ + --queue-path .. \ --queue-remote {{ queue.remote_url }} \ upload-artifacts \ --sha {{ task.branch }} \ From 6f1beb68515c01633bf8b72bab0a6e47bfc5b556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 31 Jan 2020 19:41:24 +0100 Subject: [PATCH 4/9] debug paths --- dev/tasks/gandiva-jars/travis.osx.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index 877f2059987..ea2af4c9ab6 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -33,6 +33,7 @@ env: - ARROW_TRAVIS_GANDIVA=1 before_script: + - pwd - git clone --no-checkout {{ arrow.remote }} arrow - git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} - if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi @@ -54,15 +55,17 @@ script: # - dev/tasks/gandiva-jars/build-java.sh || travis_terminate 1 - echo "gandiva" > dist/test.jar # deploy using crossbow - - brew install libgit2 python3 - - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz - - python3 dev/tasks/crossbow.py \ - --queue-path .. \ - --queue-remote {{ queue.remote_url }} \ - upload-artifacts \ - --sha {{ task.branch }} \ - --tag {{ task.tag }} \ - --pattern "dist/*.jar" + # - brew install libgit2 python3 + # - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz + - echo $TRAVIS_BUILD_DIR + - ls $TRAVIS_BUILD_DIR + # - python3 dev/tasks/crossbow.py \ + # --queue-path .. \ + # --queue-remote {{ queue.remote_url }} \ + # upload-artifacts \ + # --sha {{ task.branch }} \ + # --tag {{ task.tag }} \ + # --pattern "dist/*.jar" notifications: email: From b50865e70cc4fbf162382439afafe65e07d7f3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 31 Jan 2020 19:47:33 +0100 Subject: [PATCH 5/9] use travis_build_dir --- dev/tasks/gandiva-jars/travis.osx.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index ea2af4c9ab6..5d0edae6b5b 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -55,17 +55,15 @@ script: # - dev/tasks/gandiva-jars/build-java.sh || travis_terminate 1 - echo "gandiva" > dist/test.jar # deploy using crossbow - # - brew install libgit2 python3 - # - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz - - echo $TRAVIS_BUILD_DIR - - ls $TRAVIS_BUILD_DIR - # - python3 dev/tasks/crossbow.py \ - # --queue-path .. \ - # --queue-remote {{ queue.remote_url }} \ - # upload-artifacts \ - # --sha {{ task.branch }} \ - # --tag {{ task.tag }} \ - # --pattern "dist/*.jar" + - brew install libgit2 python3 + - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz + - python3 dev/tasks/crossbow.py \ + --queue-path $TRAVIS_BUILD_DIR \ + --queue-remote {{ queue.remote_url }} \ + upload-artifacts \ + --sha {{ task.branch }} \ + --tag {{ task.tag }} \ + --pattern "dist/*.jar" notifications: email: From 2131836b6fe29b3eae2e5c237e0eaae25db97b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 31 Jan 2020 19:54:59 +0100 Subject: [PATCH 6/9] travis multi line string --- dev/tasks/gandiva-jars/travis.osx.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index 5d0edae6b5b..f8b90588305 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -57,12 +57,13 @@ script: # deploy using crossbow - brew install libgit2 python3 - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz - - python3 dev/tasks/crossbow.py \ - --queue-path $TRAVIS_BUILD_DIR \ - --queue-remote {{ queue.remote_url }} \ - upload-artifacts \ - --sha {{ task.branch }} \ - --tag {{ task.tag }} \ + - > + python3 dev/tasks/crossbow.py + --queue-path $TRAVIS_BUILD_DIR + --queue-remote {{ queue.remote_url }} + upload-artifacts + --sha {{ task.branch }} + --tag {{ task.tag }} --pattern "dist/*.jar" notifications: From 421142dba8143b57b3d545a236b3c317eb22bb36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 31 Jan 2020 20:01:43 +0100 Subject: [PATCH 7/9] start all arguments at the same column... --- dev/tasks/gandiva-jars/travis.osx.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index f8b90588305..5bfacff4b3a 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -59,12 +59,12 @@ script: - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz - > python3 dev/tasks/crossbow.py - --queue-path $TRAVIS_BUILD_DIR - --queue-remote {{ queue.remote_url }} - upload-artifacts - --sha {{ task.branch }} - --tag {{ task.tag }} - --pattern "dist/*.jar" + --queue-path $TRAVIS_BUILD_DIR + --queue-remote {{ queue.remote_url }} + upload-artifacts + --sha {{ task.branch }} + --tag {{ task.tag }} + --pattern "dist/*.jar" notifications: email: From d956297c74db64a359d6febc3ed98e07d96a47c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 31 Jan 2020 20:11:19 +0100 Subject: [PATCH 8/9] re-enable steps --- dev/tasks/gandiva-jars/travis.osx.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index 5bfacff4b3a..fad15bf483f 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -37,23 +37,21 @@ before_script: - git clone --no-checkout {{ arrow.remote }} arrow - git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} - if [ $CROSSBOW_USE_COMMIT_ID = true ]; then git -C arrow checkout {{ arrow.head }}; else git -C arrow checkout FETCH_HEAD; fi - - # - export TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR/arrow - # - brew update - # - brew install bison flex llvm@7 - # - brew tap adoptopenjdk/openjdk - # - brew cask install adoptopenjdk8 - # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home - # - export PATH="$JAVA_HOME/bin:$PATH" - # - echo $JAVA_HOME - # - which java + - export TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR/arrow + - brew update + - brew install bison flex llvm@7 + - brew tap adoptopenjdk/openjdk + - brew cask install adoptopenjdk8 + - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home + - export PATH="$JAVA_HOME/bin:$PATH" + - echo $JAVA_HOME + - which java script: - cd arrow - mkdir -p dist - # - dev/tasks/gandiva-jars/build-cpp-osx.sh || travis_terminate 1 - # - dev/tasks/gandiva-jars/build-java.sh || travis_terminate 1 - - echo "gandiva" > dist/test.jar + - dev/tasks/gandiva-jars/build-cpp-osx.sh || travis_terminate 1 + - dev/tasks/gandiva-jars/build-java.sh || travis_terminate 1 # deploy using crossbow - brew install libgit2 python3 - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz From d50b8c8975f5d7a34f291e62742640ac9e92218c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Mon, 3 Feb 2020 12:02:34 +0100 Subject: [PATCH 9/9] don't install already installed python3 --- dev/tasks/gandiva-jars/travis.osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index fad15bf483f..8a43e3a2429 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -53,7 +53,7 @@ script: - dev/tasks/gandiva-jars/build-cpp-osx.sh || travis_terminate 1 - dev/tasks/gandiva-jars/build-java.sh || travis_terminate 1 # deploy using crossbow - - brew install libgit2 python3 + - brew install libgit2 - pip3 install click github3.py jinja2 jira pygit2 ruamel.yaml setuptools_scm toolz - > python3 dev/tasks/crossbow.py