From 85412d9241596e274e1e4e9da7a6059919fca6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 20:08:19 +0200 Subject: [PATCH 01/15] Update verification process --- dev/archery/archery/bot.py | 14 ++-- dev/release/verify-release-candidate.sh | 22 +++-- dev/tasks/crossbow.py | 32 ++++++-- dev/tasks/tasks.yml | 67 ++++++--------- dev/tasks/verify-rc/github.linux.yml | 76 +++++++++++++++++ dev/tasks/verify-rc/github.nix.yml | 82 ------------------- ...thub.windows.wheels.yml => github.osx.yml} | 29 +++++-- ...thub.windows.source.yml => github.win.yml} | 9 +- 8 files changed, 174 insertions(+), 157 deletions(-) create mode 100644 dev/tasks/verify-rc/github.linux.yml delete mode 100644 dev/tasks/verify-rc/github.nix.yml rename dev/tasks/verify-rc/{github.windows.wheels.yml => github.osx.yml} (62%) rename dev/tasks/verify-rc/{github.windows.source.yml => github.win.yml} (91%) diff --git a/dev/archery/archery/bot.py b/dev/archery/archery/bot.py index baa5210130d..d222d1ef377 100644 --- a/dev/archery/archery/bot.py +++ b/dev/archery/archery/bot.py @@ -253,13 +253,15 @@ def crossbow(obj, crossbow): @crossbow.command() -@click.argument('task', nargs=-1, required=False) -@click.option('--group', '-g', multiple=True, +@click.argument('tasks', nargs=-1, required=False) +@click.option('--group', '-g', 'groups', multiple=True, help='Submit task groups as defined in tests.yml') +@click.option('--param', '-p', 'params', multiple=True, + help='Additional task parameters for rendering the CI templates') @click.option('--dry-run/--push', default=False, help='Just display the new changelog, don\'t write it') @click.pass_obj -def submit(obj, task, group, dry_run): +def submit(obj, tasks, groups, params, dry_run): """Submit crossbow testing tasks. See groups defined in arrow/dev/tasks/tests.yml @@ -273,9 +275,11 @@ def submit(obj, task, group, dry_run): if dry_run: args.append('--dry-run') - for g in group: + for p in params: + args.extend(['-p', p]) + for g in groups: args.extend(['-g', g]) - for t in task: + for t in tasks: args.append(t) # pygithub pull request object diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index 6fd72ccc542..e46d60a8c54 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -233,12 +233,14 @@ setup_miniconda() { . $MINICONDA/etc/profile.d/conda.sh - conda create -n arrow-test -y -q -c conda-forge \ - python=3.6 \ - nomkl \ - numpy \ - pandas \ - cython + if [ ! -d "${MINICONDA}" ]; then + conda create -n arrow-test -y -q -c conda-forge \ + python=3.6 \ + nomkl \ + numpy \ + pandas \ + cython + fi conda activate arrow-test } @@ -374,7 +376,7 @@ test_python() { fi python setup.py build_ext --inplace - py.test pyarrow -v --pdb + pytest pyarrow -v --pdb popd } @@ -785,8 +787,10 @@ if [ "${ARTIFACT}" == "source" ]; then dist_name="apache-arrow-${VERSION}" if [ ${TEST_SOURCE} -gt 0 ]; then import_gpg_keys - fetch_archive ${dist_name} - tar xf ${dist_name}.tar.gz + if [ ! -d "${dist_name}" ]; then + fetch_archive ${dist_name} + tar xf ${dist_name}.tar.gz + fi else mkdir -p ${dist_name} if [ ! -f ${TEST_ARCHIVE} ]; then diff --git a/dev/tasks/crossbow.py b/dev/tasks/crossbow.py index 5981d56613e..a68794c3ac1 100755 --- a/dev/tasks/crossbow.py +++ b/dev/tasks/crossbow.py @@ -582,7 +582,8 @@ def put(self, job, prefix='build'): # adding CI's name to the end of the branch in order to use skip # patterns on travis and circleci task.branch = '{}-{}-{}'.format(job.branch, task.ci, task_name) - files = task.render_files(arrow=job.target, + files = task.render_files(**job.params, + arrow=job.target, queue_remote_url=self.remote_url) branch = self.create_branch(task.branch, files=files) self.create_tag(task.tag, branch.target) @@ -709,12 +710,12 @@ def __init__(self, ci, template, artifacts=None, params=None): self._status = None # status cache self._assets = None # assets cache - def render_files(self, **extra_params): + def render_files(self, **params): from jinja2 import Template, StrictUndefined from jinja2.exceptions import TemplateError path = CWD / self.template - params = toolz.merge(self.params, extra_params) + params = toolz.merge(self.params, params) template = Template(path.read_text(), undefined=StrictUndefined) try: rendered = template.render(task=self, **params) @@ -871,15 +872,21 @@ def uploaded_assets(self): class Job(Serializable): """Describes multiple tasks against a single target repository""" - def __init__(self, target, tasks): + def __init__(self, target, tasks, params=None): if not tasks: raise ValueError('no tasks were provided for the job') if not all(isinstance(task, Task) for task in tasks.values()): raise ValueError('each `tasks` mus be an instance of Task') if not isinstance(target, Target): raise ValueError('`target` must be an instance of Target') + if not isinstance(target, Target): + raise ValueError('`target` must be an instance of Target') + if not isinstance(params, dict): + raise ValueError('`params` must be an instance of dict') + self.target = target self.tasks = tasks + self.params = params or {} # additional parameters for the tasks self.branch = None # filled after adding to a queue self._queue = None # set by the queue object after put or get @@ -911,7 +918,7 @@ def date(self): return self.queue.date_of(self) @classmethod - def from_config(cls, config, target, tasks=None, groups=None): + def from_config(cls, config, target, tasks=None, groups=None, params=None): """ Intantiate a job from based on a config. @@ -923,9 +930,11 @@ def from_config(cls, config, target, tasks=None, groups=None): Describes target repository and revision the builds run against. tasks : Optional[List[str]], default None List of glob patterns for matching task names. - groups : tasks : Optional[List[str]], default None + groups : Optional[List[str]], default None List of exact group names matching predefined task sets in the config. + params : Optional[Dict[str, str]], default None + Additional rendering parameters for the task templates. Returns ------- @@ -948,7 +957,7 @@ def from_config(cls, config, target, tasks=None, groups=None): artifacts = [fn.format(**versions) for fn in artifacts] tasks[task_name] = Task(artifacts=artifacts, **task) - return cls(target=target, tasks=tasks) + return cls(target=target, tasks=tasks, params=params) def is_finished(self): for task in self.tasks.values(): @@ -1408,6 +1417,8 @@ def check_config(config_path): @click.argument('tasks', nargs=-1, required=False) @click.option('--group', '-g', 'groups', multiple=True, help='Submit task groups as defined in task.yml') +@click.option('--param', '-p', 'params', multiple=True, + help='Additional task parameters for rendering the CI templates') @click.option('--job-prefix', default='build', help='Arbitrary prefix for branch names, e.g. nightly') @click.option('--config-path', '-c', @@ -1429,7 +1440,7 @@ def check_config(config_path): help='Just display the rendered CI configurations without ' 'submitting them') @click.pass_obj -def submit(obj, tasks, groups, job_prefix, config_path, arrow_version, +def submit(obj, tasks, groups, params, job_prefix, config_path, arrow_version, arrow_remote, arrow_branch, arrow_sha, dry_run): output = obj['output'] queue, arrow = obj['queue'], obj['arrow'] @@ -1448,9 +1459,12 @@ def submit(obj, tasks, groups, job_prefix, config_path, arrow_version, target = Target.from_repo(arrow, remote=arrow_remote, branch=arrow_branch, head=arrow_sha, version=arrow_version) + # parse additional job parameters + params = dict([p.split("=") for p in params]) + # instantiate the job object job = Job.from_config(config=config, target=target, tasks=tasks, - groups=groups) + groups=groups, params=params) if dry_run: yaml.dump(job, output) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 48823c4f6ea..745ad20faae 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1358,7 +1358,7 @@ tasks: verify-rc-binaries-binary: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: os: "ubuntu" artifact: "binaries" @@ -1366,7 +1366,7 @@ tasks: verify-rc-binaries-apt: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: os: "ubuntu" artifact: "binaries" @@ -1374,7 +1374,7 @@ tasks: verify-rc-binaries-yum: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: os: "ubuntu" artifact: "binaries" @@ -1382,7 +1382,7 @@ tasks: verify-rc-wheels-linux: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: os: "ubuntu" artifact: "wheels" @@ -1390,147 +1390,134 @@ tasks: verify-rc-wheels-macos: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "wheels" flag: "" verify-rc-source-macos-java: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "source" flag: "TEST_JAVA=1" verify-rc-source-macos-csharp: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "source" flag: "TEST_CSHARP=1" verify-rc-source-macos-ruby: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "source" flag: "TEST_RUBY=1" verify-rc-source-macos-python: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "source" flag: "TEST_PYTHON=1" verify-rc-source-macos-js: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "source" flag: "TEST_JS=1" verify-rc-source-macos-go: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "source" flag: "TEST_GO=1" verify-rc-source-macos-rust: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "source" flag: "TEST_RUST=1" verify-rc-source-macos-integration: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.osx.yml params: - os: "macOS" artifact: "source" flag: "TEST_INTEGRATION=1" verify-rc-source-linux-java: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: - os: "ubuntu" artifact: "source" flag: "TEST_JAVA=1" verify-rc-source-linux-csharp: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: - os: "ubuntu" artifact: "source" flag: "TEST_CSHARP=1" verify-rc-source-linux-ruby: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: - os: "ubuntu" artifact: "source" flag: "TEST_RUBY=1" verify-rc-source-linux-python: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: - os: "ubuntu" artifact: "source" flag: "TEST_PYTHON=1" verify-rc-source-linux-js: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: - os: "ubuntu" artifact: "source" flag: "TEST_JS=1" verify-rc-source-linux-go: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: - os: "ubuntu" artifact: "source" flag: "TEST_GO=1" verify-rc-source-linux-rust: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: - os: "ubuntu" artifact: "source" flag: "TEST_RUST=1" verify-rc-source-linux-integration: ci: github - template: verify-rc/github.nix.yml + template: verify-rc/github.linux.yml params: - os: "ubuntu" artifact: "source" flag: "TEST_INTEGRATION=1" verify-rc-source-windows: ci: github - template: verify-rc/github.windows.source.yml + template: verify-rc/github.win.yml + params: + script: "verify-release-candidate.bat" verify-rc-wheels-windows: ci: github - template: verify-rc/github.windows.wheels.yml + template: verify-rc/github.win.yml + params: + script: "verify-release-candidate-wheels.bat" ############################## Docker tests ################################# diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml new file mode 100644 index 00000000000..94a2a6e9ce7 --- /dev/null +++ b/dev/tasks/verify-rc/github.linux.yml @@ -0,0 +1,76 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# NOTE: must set "Crossbow" as name to have the badge links working in the +# github comment reports! +name: Crossbow + +on: + push: + branches: + - "*-github-*" + +jobs: + verify: + name: "Verify release candidate Ubuntu {{ artifact }} {{ flag }}" + runs-on: ubuntu-latest + steps: + - name: Checkout Arrow + run: | + git clone --no-checkout {{ arrow.remote }} arrow + git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} + git -C arrow checkout FETCH_HEAD + git -C arrow submodule update --init --recursive + - name: Free Up Disk Space + shell: bash + run: arrow/ci/scripts/util_cleanup.sh + - name: Fetch Submodules and Tags + shell: bash + run: cd arrow && ci/scripts/util_checkout.sh + - name: Install System Dependencies + run: | + {{ flag }} + + # TODO: don't require removing newer llvms + sudo apt-get --purge remove -y llvm-9 clang-9 + sudo apt-get install -y \ + wget curl libboost-all-dev jq \ + autoconf-archive gtk-doc-tools libgirepository1.0-dev flex bison + + if [ "$TEST_JAVA" = "1" ]; then + # Maven + MAVEN_VERSION=3.6.3 + wget https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.zip + unzip apache-maven-$MAVEN_VERSION-bin.zip + mkdir -p $HOME/java + mv apache-maven-$MAVEN_VERSION $HOME/java + export PATH=$HOME/java/apache-maven-$MAVEN_VERSION/bin:$PATH + fi + + if [ "$TEST_RUBY" = "1" ]; then + ruby --version + sudo gem install bundler + fi + - name: Run verification + shell: bash + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + run: | + {{ flag }} arrow/dev/release/verify-release-candidate.sh \ + {{ artifact }} \ + {{ release|default("1.0.0") }} {{ rc|default("0") }} diff --git a/dev/tasks/verify-rc/github.nix.yml b/dev/tasks/verify-rc/github.nix.yml deleted file mode 100644 index 8482cdc97ca..00000000000 --- a/dev/tasks/verify-rc/github.nix.yml +++ /dev/null @@ -1,82 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# NOTE: must set "Crossbow" as name to have the badge links working in the -# github comment reports! -name: Crossbow - -on: - push: - branches: - - "*-github-*" - -jobs: - verify: - name: "Verify release candidate {{ os }} {{ artifact }} {{ flag }}" - runs-on: {{ os }}-latest - steps: - - name: Checkout Arrow - run: | - git clone --no-checkout {{ arrow.remote }} arrow - git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} - git -C arrow checkout FETCH_HEAD - git -C arrow submodule update --init --recursive - - name: Free Up Disk Space - shell: bash - run: arrow/ci/scripts/util_cleanup.sh - - name: Fetch Submodules and Tags - shell: bash - run: cd arrow && ci/scripts/util_checkout.sh - - name: Run verification - shell: bash - env: - INSTALL_NODE: 0 - run: | - set -e - - {{ flag }} - if [ $(uname) = "Darwin" ]; then - brew update - brew bundle --file=arrow/cpp/Brewfile - brew bundle --file=arrow/c_glib/Brewfile - if [ "$TEST_PYTHON" = "1" ]; then - # https://stackoverflow.com/questions/56083725/macos-build-issues-lstdc-not-found-while-building-python-package - export MACOSX_DEPLOYMENT_TARGET=10.9 - fi - else - # TODO: don't require removing newer llvms - sudo apt-get --purge remove -y llvm-9 clang-9 - sudo apt-get install -y \ - wget curl libboost-all-dev jq \ - autoconf-archive gtk-doc-tools libgirepository1.0-dev flex bison - if [ "$TEST_JAVA" = "1" ]; then - # Maven - MAVEN_VERSION=3.6.3 - wget https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.zip - unzip apache-maven-$MAVEN_VERSION-bin.zip - mkdir -p $HOME/java - mv apache-maven-$MAVEN_VERSION $HOME/java - export PATH=$HOME/java/apache-maven-$MAVEN_VERSION/bin:$PATH - fi - if [ "$TEST_RUBY" = "1" ]; then - ruby --version - sudo gem install bundler - fi - fi - # TODO: put version and rc number in some separate file? - # If you edit the versions, be sure to edit the other workflow files in this directory too - TEST_DEFAULT=0 {{ flag }} arrow/dev/release/verify-release-candidate.sh {{ artifact }} 0.17.0 0 diff --git a/dev/tasks/verify-rc/github.windows.wheels.yml b/dev/tasks/verify-rc/github.osx.yml similarity index 62% rename from dev/tasks/verify-rc/github.windows.wheels.yml rename to dev/tasks/verify-rc/github.osx.yml index 082c2aa04ca..684775a56ce 100644 --- a/dev/tasks/verify-rc/github.windows.wheels.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -26,8 +26,8 @@ on: jobs: verify: - name: "Verify release candidate Windows wheels" - runs-on: windows-latest + name: "Verify release candidate macOS {{ artifact }} {{ flag }}" + runs-on: macos-latest steps: - name: Checkout Arrow run: | @@ -35,14 +35,27 @@ jobs: git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} git -C arrow checkout FETCH_HEAD git -C arrow submodule update --init --recursive + - name: Free Up Disk Space + shell: bash + run: arrow/ci/scripts/util_cleanup.sh - name: Fetch Submodules and Tags shell: bash run: cd arrow && ci/scripts/util_checkout.sh - - uses: s-weigand/setup-conda@v1 + - name: Install System Dependencies + shell: bash + run: | + brew update + brew bundle --file=arrow/cpp/Brewfile + brew bundle --file=arrow/c_glib/Brewfile + brew reinstall node - name: Run verification - shell: cmd + shell: bash + env: + TEST_DEFAULT: 0 + INSTALL_NODE: 0 + # https://stackoverflow.com/questions/56083725/macos-build-issues-lstdc-not-found-while-building-python-package + MACOSX_DEPLOYMENT_TARGET: "10.9" run: | - choco install wget - cd arrow - # If you edit the versions, be sure to edit the other workflow files in this directory too - dev/release/verify-release-candidate-wheels.bat 0.17.0 0 + {{ flag }} arrow/dev/release/verify-release-candidate.sh \ + {{ artifact }} \ + {{ release|default("1.0.0") }} {{ rc|default("0") }} diff --git a/dev/tasks/verify-rc/github.windows.source.yml b/dev/tasks/verify-rc/github.win.yml similarity index 91% rename from dev/tasks/verify-rc/github.windows.source.yml rename to dev/tasks/verify-rc/github.win.yml index d236bb0a2a5..fe2ff4aa6d3 100644 --- a/dev/tasks/verify-rc/github.windows.source.yml +++ b/dev/tasks/verify-rc/github.win.yml @@ -39,11 +39,12 @@ jobs: shell: bash run: cd arrow && ci/scripts/util_checkout.sh - uses: s-weigand/setup-conda@v1 - - name: Run verification - shell: cmd + - name: Install System Dependencies run: | choco install boost-msvc-14.1 choco install wget + - name: Run verification + shell: cmd + run: | cd arrow - # If you edit the versions, be sure to edit the other workflow files in this directory too - dev/release/verify-release-candidate.bat 0.17.0 0 + dev/release/{{ script }} {{ release|default("1.0.0") }} {{ rc|default("0") }} From 70d50a75259aa3c52b9e2f08faf901d6544577fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 20:38:50 +0200 Subject: [PATCH 02/15] Install node and configure vscode --- dev/tasks/verify-rc/github.linux.yml | 3 +++ dev/tasks/verify-rc/github.osx.yml | 4 +++- dev/tasks/verify-rc/github.win.yml | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml index 94a2a6e9ce7..a72491c3212 100644 --- a/dev/tasks/verify-rc/github.linux.yml +++ b/dev/tasks/verify-rc/github.linux.yml @@ -65,6 +65,9 @@ jobs: ruby --version sudo gem install bundler fi + - uses: actions/setup-node@v2-beta + with: + node-version: '12' - name: Run verification shell: bash env: diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index 684775a56ce..8841c0339f9 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -47,7 +47,9 @@ jobs: brew update brew bundle --file=arrow/cpp/Brewfile brew bundle --file=arrow/c_glib/Brewfile - brew reinstall node + - uses: actions/setup-node@v2-beta + with: + node-version: '12' - name: Run verification shell: bash env: diff --git a/dev/tasks/verify-rc/github.win.yml b/dev/tasks/verify-rc/github.win.yml index fe2ff4aa6d3..25a67c367e7 100644 --- a/dev/tasks/verify-rc/github.win.yml +++ b/dev/tasks/verify-rc/github.win.yml @@ -39,6 +39,9 @@ jobs: shell: bash run: cd arrow && ci/scripts/util_checkout.sh - uses: s-weigand/setup-conda@v1 + - uses: ilammy/msvc-dev-cmd@v1 + with: + toolset: 14.1 - name: Install System Dependencies run: | choco install boost-msvc-14.1 From 4c7b424398f708a34027fcbe38a372c38c453607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 20:52:33 +0200 Subject: [PATCH 03/15] Setup conda --- dev/tasks/verify-rc/github.linux.yml | 1 + dev/tasks/verify-rc/github.osx.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml index a72491c3212..9d7cb5f64f1 100644 --- a/dev/tasks/verify-rc/github.linux.yml +++ b/dev/tasks/verify-rc/github.linux.yml @@ -68,6 +68,7 @@ jobs: - uses: actions/setup-node@v2-beta with: node-version: '12' + - uses: s-weigand/setup-conda@v1 - name: Run verification shell: bash env: diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index 8841c0339f9..eff69c824f4 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -50,6 +50,7 @@ jobs: - uses: actions/setup-node@v2-beta with: node-version: '12' + - uses: s-weigand/setup-conda@v1 - name: Run verification shell: bash env: From 173fe50835b02f7bf98b1b2f9eb0c4d2e3ee5cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 21:06:04 +0200 Subject: [PATCH 04/15] Optionally install miniconda --- dev/release/verify-release-candidate.sh | 27 ++++++++++++++----------- dev/tasks/verify-rc/github.linux.yml | 1 + dev/tasks/verify-rc/github.osx.yml | 1 + 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index e46d60a8c54..5341e29b82a 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -213,8 +213,7 @@ setup_tempdir() { fi } - -setup_miniconda() { +install_miniconda() { # Setup short-lived miniconda for Python and integration tests if [ "$(uname)" == "Darwin" ]; then MINICONDA_URL=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh @@ -230,18 +229,20 @@ setup_miniconda() { bash miniconda.sh -b -p $MINICONDA rm -f miniconda.sh fi + echo "Installed miniconda at ${MINICONDA}" . $MINICONDA/etc/profile.d/conda.sh +} - if [ ! -d "${MINICONDA}" ]; then - conda create -n arrow-test -y -q -c conda-forge \ - python=3.6 \ - nomkl \ - numpy \ - pandas \ - cython - fi +setup_conda_env() { + conda create -n arrow-test -y -q -c conda-forge \ + python=3.6 \ + nomkl \ + numpy \ + pandas \ + cython conda activate arrow-test + echo "Using conda environment ${CONDA_PREFIX}" } # Build and test Java (Requires newer Maven -- I used 3.3.9) @@ -779,8 +780,10 @@ echo "Working in sandbox ${ARROW_TMPDIR}" cd ${ARROW_TMPDIR} if [ ${NEED_MINICONDA} -gt 0 ]; then - setup_miniconda - echo "Using miniconda environment ${MINICONDA}" + if [ ${INSTALL_MINICONDA:-1} -gt 0 ]; then + install_miniconda + fi + setup_conda_env fi if [ "${ARTIFACT}" == "source" ]; then diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml index 9d7cb5f64f1..576e029b771 100644 --- a/dev/tasks/verify-rc/github.linux.yml +++ b/dev/tasks/verify-rc/github.linux.yml @@ -73,6 +73,7 @@ jobs: shell: bash env: INSTALL_NODE: 0 + INSTALL_MINICONDA: 0 TEST_DEFAULT: 0 run: | {{ flag }} arrow/dev/release/verify-release-candidate.sh \ diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index eff69c824f4..9d58e27bb26 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -56,6 +56,7 @@ jobs: env: TEST_DEFAULT: 0 INSTALL_NODE: 0 + INSTALL_MINICONDA: 0 # https://stackoverflow.com/questions/56083725/macos-build-issues-lstdc-not-found-while-building-python-package MACOSX_DEPLOYMENT_TARGET: "10.9" run: | From 60b96aa5c8e5cbabf021698d63e4c7cd4141afb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 21:23:11 +0200 Subject: [PATCH 05/15] Properly activate conda environment --- dev/tasks/verify-rc/github.linux.yml | 9 +++++++-- dev/tasks/verify-rc/github.osx.yml | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml index 576e029b771..187ea40cd31 100644 --- a/dev/tasks/verify-rc/github.linux.yml +++ b/dev/tasks/verify-rc/github.linux.yml @@ -68,9 +68,14 @@ jobs: - uses: actions/setup-node@v2-beta with: node-version: '12' - - uses: s-weigand/setup-conda@v1 + - uses: conda-incubator/setup-miniconda@v1 + with: + python-version: 3.6 + channels: conda-forge,defaults + channel-priority: strict + show-channel-urls: true - name: Run verification - shell: bash + shell: bash -l {0} env: INSTALL_NODE: 0 INSTALL_MINICONDA: 0 diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index 9d58e27bb26..273b0b763b5 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -50,9 +50,14 @@ jobs: - uses: actions/setup-node@v2-beta with: node-version: '12' - - uses: s-weigand/setup-conda@v1 + - uses: conda-incubator/setup-miniconda@v1 + with: + python-version: 3.6 + channels: conda-forge,defaults + channel-priority: strict + show-channel-urls: true - name: Run verification - shell: bash + shell: bash -l {0} env: TEST_DEFAULT: 0 INSTALL_NODE: 0 From a37eb159790db43826a0548c6f33fdcaa239a91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 21:59:37 +0200 Subject: [PATCH 06/15] Debug env --- dev/release/verify-release-candidate.sh | 10 +++++++++- dev/tasks/verify-rc/github.linux.yml | 7 ++----- dev/tasks/verify-rc/github.osx.yml | 7 ++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index 5341e29b82a..86d113e7c3c 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -33,6 +33,14 @@ # a directory where the temporary files should be placed to, note that this # directory is not cleaned up automatically. +env +which python +which conda +conda env list +conda list + +conda activate base + case $# in 3) ARTIFACT="$1" VERSION="$2" @@ -213,7 +221,7 @@ setup_tempdir() { fi } -install_miniconda() { +setup_miniconda() { # Setup short-lived miniconda for Python and integration tests if [ "$(uname)" == "Darwin" ]; then MINICONDA_URL=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml index 187ea40cd31..5705f67b334 100644 --- a/dev/tasks/verify-rc/github.linux.yml +++ b/dev/tasks/verify-rc/github.linux.yml @@ -35,9 +35,6 @@ jobs: git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} git -C arrow checkout FETCH_HEAD git -C arrow submodule update --init --recursive - - name: Free Up Disk Space - shell: bash - run: arrow/ci/scripts/util_cleanup.sh - name: Fetch Submodules and Tags shell: bash run: cd arrow && ci/scripts/util_checkout.sh @@ -67,13 +64,13 @@ jobs: fi - uses: actions/setup-node@v2-beta with: - node-version: '12' + node-version: '14' - uses: conda-incubator/setup-miniconda@v1 with: - python-version: 3.6 channels: conda-forge,defaults channel-priority: strict show-channel-urls: true + auto-update-conda: false - name: Run verification shell: bash -l {0} env: diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index 273b0b763b5..d8eae5ac8b8 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -35,9 +35,6 @@ jobs: git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} git -C arrow checkout FETCH_HEAD git -C arrow submodule update --init --recursive - - name: Free Up Disk Space - shell: bash - run: arrow/ci/scripts/util_cleanup.sh - name: Fetch Submodules and Tags shell: bash run: cd arrow && ci/scripts/util_checkout.sh @@ -49,12 +46,12 @@ jobs: brew bundle --file=arrow/c_glib/Brewfile - uses: actions/setup-node@v2-beta with: - node-version: '12' + node-version: '14' - uses: conda-incubator/setup-miniconda@v1 with: - python-version: 3.6 channels: conda-forge,defaults channel-priority: strict + auto-update-conda: false show-channel-urls: true - name: Run verification shell: bash -l {0} From dea50478786496b91708f0419217712a049c8672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 22:06:47 +0200 Subject: [PATCH 07/15] always install miniconda --- dev/release/verify-release-candidate.sh | 17 ++--------------- dev/tasks/verify-rc/github.linux.yml | 9 +-------- dev/tasks/verify-rc/github.osx.yml | 3 +-- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index 86d113e7c3c..35aa8cc9ff6 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -33,14 +33,6 @@ # a directory where the temporary files should be placed to, note that this # directory is not cleaned up automatically. -env -which python -which conda -conda env list -conda list - -conda activate base - case $# in 3) ARTIFACT="$1" VERSION="$2" @@ -221,7 +213,7 @@ setup_tempdir() { fi } -setup_miniconda() { +install_miniconda() { # Setup short-lived miniconda for Python and integration tests if [ "$(uname)" == "Darwin" ]; then MINICONDA_URL=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh @@ -240,9 +232,7 @@ setup_miniconda() { echo "Installed miniconda at ${MINICONDA}" . $MINICONDA/etc/profile.d/conda.sh -} -setup_conda_env() { conda create -n arrow-test -y -q -c conda-forge \ python=3.6 \ nomkl \ @@ -788,10 +778,7 @@ echo "Working in sandbox ${ARROW_TMPDIR}" cd ${ARROW_TMPDIR} if [ ${NEED_MINICONDA} -gt 0 ]; then - if [ ${INSTALL_MINICONDA:-1} -gt 0 ]; then - install_miniconda - fi - setup_conda_env + setup_miniconda fi if [ "${ARTIFACT}" == "source" ]; then diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml index 5705f67b334..0ac3d5cc638 100644 --- a/dev/tasks/verify-rc/github.linux.yml +++ b/dev/tasks/verify-rc/github.linux.yml @@ -65,17 +65,10 @@ jobs: - uses: actions/setup-node@v2-beta with: node-version: '14' - - uses: conda-incubator/setup-miniconda@v1 - with: - channels: conda-forge,defaults - channel-priority: strict - show-channel-urls: true - auto-update-conda: false - name: Run verification - shell: bash -l {0} + shell: bash env: INSTALL_NODE: 0 - INSTALL_MINICONDA: 0 TEST_DEFAULT: 0 run: | {{ flag }} arrow/dev/release/verify-release-candidate.sh \ diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index d8eae5ac8b8..f9c522a4782 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -54,11 +54,10 @@ jobs: auto-update-conda: false show-channel-urls: true - name: Run verification - shell: bash -l {0} + shell: bash env: TEST_DEFAULT: 0 INSTALL_NODE: 0 - INSTALL_MINICONDA: 0 # https://stackoverflow.com/questions/56083725/macos-build-issues-lstdc-not-found-while-building-python-package MACOSX_DEPLOYMENT_TARGET: "10.9" run: | From 2477c2d148bd4ca5be02b6936ee96ac5d12c850b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 22:12:26 +0200 Subject: [PATCH 08/15] fix function name --- dev/release/verify-release-candidate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index 35aa8cc9ff6..e0f5f0e4a90 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -213,7 +213,7 @@ setup_tempdir() { fi } -install_miniconda() { +setup_miniconda() { # Setup short-lived miniconda for Python and integration tests if [ "$(uname)" == "Darwin" ]; then MINICONDA_URL=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh From 29ff86895ab52aefa5cf629f5a271310330f156e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 14 Oct 2020 22:19:48 +0200 Subject: [PATCH 09/15] don't use setup miniconda action on osx either --- dev/tasks/verify-rc/github.osx.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index f9c522a4782..ce85b6b04c5 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -47,12 +47,6 @@ jobs: - uses: actions/setup-node@v2-beta with: node-version: '14' - - uses: conda-incubator/setup-miniconda@v1 - with: - channels: conda-forge,defaults - channel-priority: strict - auto-update-conda: false - show-channel-urls: true - name: Run verification shell: bash env: From 91c1c61d0887be8205d7a7ab7585876468165f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 15 Oct 2020 00:08:21 +0200 Subject: [PATCH 10/15] windows 2016 --- dev/tasks/verify-rc/github.win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/verify-rc/github.win.yml b/dev/tasks/verify-rc/github.win.yml index 25a67c367e7..a966a0b8d6f 100644 --- a/dev/tasks/verify-rc/github.win.yml +++ b/dev/tasks/verify-rc/github.win.yml @@ -27,7 +27,7 @@ on: jobs: verify: name: "Verify release candidate Windows source" - runs-on: windows-latest + runs-on: windows-2016 steps: - name: Checkout Arrow run: | From c2884aece81d298846e330d24eadb0848d65249b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 15 Oct 2020 00:09:07 +0200 Subject: [PATCH 11/15] remove msvc setup action --- dev/tasks/verify-rc/github.win.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev/tasks/verify-rc/github.win.yml b/dev/tasks/verify-rc/github.win.yml index a966a0b8d6f..b872bbfb436 100644 --- a/dev/tasks/verify-rc/github.win.yml +++ b/dev/tasks/verify-rc/github.win.yml @@ -39,9 +39,6 @@ jobs: shell: bash run: cd arrow && ci/scripts/util_checkout.sh - uses: s-weigand/setup-conda@v1 - - uses: ilammy/msvc-dev-cmd@v1 - with: - toolset: 14.1 - name: Install System Dependencies run: | choco install boost-msvc-14.1 From 4b0c4ae1351a0a70d813315e4097afc000a67883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 15 Oct 2020 13:34:07 +0200 Subject: [PATCH 12/15] define env variable in tasks.yml --- dev/tasks/tasks.yml | 84 +++++++++++++++++++++------- dev/tasks/verify-rc/github.linux.yml | 13 +++-- dev/tasks/verify-rc/github.osx.yml | 13 +++-- dev/tasks/verify-rc/github.win.yml | 6 ++ 4 files changed, 83 insertions(+), 33 deletions(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 745ad20faae..1a43d00e749 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1360,40 +1360,44 @@ tasks: ci: github template: verify-rc/github.linux.yml params: - os: "ubuntu" + env: + TEST_DEFAULT: 0 + TEST_BINARY: 1 artifact: "binaries" - flag: "TEST_BINARY=1" verify-rc-binaries-apt: ci: github template: verify-rc/github.linux.yml params: - os: "ubuntu" + env: + TEST_DEFAULT: 0 + TEST_APT: 1 artifact: "binaries" - flag: "TEST_APT=1" verify-rc-binaries-yum: ci: github template: verify-rc/github.linux.yml params: - os: "ubuntu" + env: + TEST_DEFAULT: 0 + TEST_YUM: 1 artifact: "binaries" - flag: "TEST_YUM=1" verify-rc-wheels-linux: ci: github template: verify-rc/github.linux.yml params: - os: "ubuntu" + env: + TEST_DEFAULT: 0 artifact: "wheels" - flag: "" verify-rc-wheels-macos: ci: github template: verify-rc/github.osx.yml params: + env: + TEST_DEFAULT: 0 artifact: "wheels" - flag: "" verify-rc-source-macos-java: ci: github @@ -1420,29 +1424,43 @@ tasks: ci: github template: verify-rc/github.osx.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_PYTHON: 1 + # https://stackoverflow.com/questions/56083725/macos-build-issues-lstdc-not-found-while-building-python-package + MACOS_DEPLOYMENT_TARGET: "10.15" artifact: "source" - flag: "TEST_PYTHON=1" verify-rc-source-macos-js: ci: github template: verify-rc/github.osx.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_JS: 1 artifact: "source" - flag: "TEST_JS=1" verify-rc-source-macos-go: ci: github template: verify-rc/github.osx.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_GO: 1 artifact: "source" - flag: "TEST_GO=1" verify-rc-source-macos-rust: ci: github template: verify-rc/github.osx.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_RUST: 1 artifact: "source" - flag: "TEST_RUST=1" verify-rc-source-macos-integration: ci: github @@ -1455,57 +1473,81 @@ tasks: ci: github template: verify-rc/github.linux.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_JAVA: 1 artifact: "source" - flag: "TEST_JAVA=1" verify-rc-source-linux-csharp: ci: github template: verify-rc/github.linux.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_CSHARP: 1 artifact: "source" - flag: "TEST_CSHARP=1" verify-rc-source-linux-ruby: ci: github template: verify-rc/github.linux.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_RUBY: 1 artifact: "source" - flag: "TEST_RUBY=1" verify-rc-source-linux-python: ci: github template: verify-rc/github.linux.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_PYTHON: 1 artifact: "source" - flag: "TEST_PYTHON=1" verify-rc-source-linux-js: ci: github template: verify-rc/github.linux.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_JS: 1 artifact: "source" - flag: "TEST_JS=1" verify-rc-source-linux-go: ci: github template: verify-rc/github.linux.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_GO: 1 artifact: "source" - flag: "TEST_GO=1" verify-rc-source-linux-rust: ci: github template: verify-rc/github.linux.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_RUST: 1 artifact: "source" - flag: "TEST_RUST=1" verify-rc-source-linux-integration: ci: github template: verify-rc/github.linux.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_INTEGRATION: 1 artifact: "source" - flag: "TEST_INTEGRATION=1" verify-rc-source-windows: ci: github diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml index 0ac3d5cc638..7f60edaeaef 100644 --- a/dev/tasks/verify-rc/github.linux.yml +++ b/dev/tasks/verify-rc/github.linux.yml @@ -28,6 +28,12 @@ jobs: verify: name: "Verify release candidate Ubuntu {{ artifact }} {{ flag }}" runs-on: ubuntu-latest + {%- if env is defined %} + env: + {%- for key, value in env.items() %} + {{ key }}: {{ value }} + {%- endfor %} + {%- endif %} steps: - name: Checkout Arrow run: | @@ -40,8 +46,6 @@ jobs: run: cd arrow && ci/scripts/util_checkout.sh - name: Install System Dependencies run: | - {{ flag }} - # TODO: don't require removing newer llvms sudo apt-get --purge remove -y llvm-9 clang-9 sudo apt-get install -y \ @@ -67,10 +71,7 @@ jobs: node-version: '14' - name: Run verification shell: bash - env: - INSTALL_NODE: 0 - TEST_DEFAULT: 0 run: | - {{ flag }} arrow/dev/release/verify-release-candidate.sh \ + arrow/dev/release/verify-release-candidate.sh \ {{ artifact }} \ {{ release|default("1.0.0") }} {{ rc|default("0") }} diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index ce85b6b04c5..69c34c0a791 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -28,6 +28,12 @@ jobs: verify: name: "Verify release candidate macOS {{ artifact }} {{ flag }}" runs-on: macos-latest + {%- if env is defined %} + env: + {%- for key, value in env.items() %} + {{ key }}: {{ value }} + {%- endfor %} + {%- endif %} steps: - name: Checkout Arrow run: | @@ -49,12 +55,7 @@ jobs: node-version: '14' - name: Run verification shell: bash - env: - TEST_DEFAULT: 0 - INSTALL_NODE: 0 - # https://stackoverflow.com/questions/56083725/macos-build-issues-lstdc-not-found-while-building-python-package - MACOSX_DEPLOYMENT_TARGET: "10.9" run: | - {{ flag }} arrow/dev/release/verify-release-candidate.sh \ + arrow/dev/release/verify-release-candidate.sh \ {{ artifact }} \ {{ release|default("1.0.0") }} {{ rc|default("0") }} diff --git a/dev/tasks/verify-rc/github.win.yml b/dev/tasks/verify-rc/github.win.yml index b872bbfb436..fbe0ee26812 100644 --- a/dev/tasks/verify-rc/github.win.yml +++ b/dev/tasks/verify-rc/github.win.yml @@ -28,6 +28,12 @@ jobs: verify: name: "Verify release candidate Windows source" runs-on: windows-2016 + {%- if env is defined %} + env: + {%- for key, value in env.items() %} + {{ key }}: {{ value }} + {%- endfor %} + {%- endif %} steps: - name: Checkout Arrow run: | From dd7d95e05b852ac82098d22e792ede13175b2052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 15 Oct 2020 13:35:22 +0200 Subject: [PATCH 13/15] remove flag parameter from templates --- dev/tasks/verify-rc/github.linux.yml | 2 +- dev/tasks/verify-rc/github.osx.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/verify-rc/github.linux.yml b/dev/tasks/verify-rc/github.linux.yml index 7f60edaeaef..49d937ac6fa 100644 --- a/dev/tasks/verify-rc/github.linux.yml +++ b/dev/tasks/verify-rc/github.linux.yml @@ -26,7 +26,7 @@ on: jobs: verify: - name: "Verify release candidate Ubuntu {{ artifact }} {{ flag }}" + name: "Verify release candidate Ubuntu {{ artifact }}" runs-on: ubuntu-latest {%- if env is defined %} env: diff --git a/dev/tasks/verify-rc/github.osx.yml b/dev/tasks/verify-rc/github.osx.yml index 69c34c0a791..a0f6fc4af4e 100644 --- a/dev/tasks/verify-rc/github.osx.yml +++ b/dev/tasks/verify-rc/github.osx.yml @@ -26,7 +26,7 @@ on: jobs: verify: - name: "Verify release candidate macOS {{ artifact }} {{ flag }}" + name: "Verify release candidate macOS {{ artifact }}" runs-on: macos-latest {%- if env is defined %} env: From 4a13fe39680bd639114f19d5b834ed51bc5b3256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 15 Oct 2020 14:05:34 +0200 Subject: [PATCH 14/15] update remaining task configurations --- dev/tasks/tasks.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 1a43d00e749..a156e3d0c81 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1403,29 +1403,34 @@ tasks: ci: github template: verify-rc/github.osx.yml params: + env: + TEST_DEFAULT: 0 + TEST_JAVA: 1 artifact: "source" - flag: "TEST_JAVA=1" verify-rc-source-macos-csharp: ci: github template: verify-rc/github.osx.yml params: + env: + TEST_DEFAULT: 0 + TEST_CSHARP: 1 artifact: "source" - flag: "TEST_CSHARP=1" verify-rc-source-macos-ruby: ci: github template: verify-rc/github.osx.yml params: + env: + TEST_DEFAULT: 0 + TEST_RUBY: 1 artifact: "source" - flag: "TEST_RUBY=1" verify-rc-source-macos-python: ci: github template: verify-rc/github.osx.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_PYTHON: 1 # https://stackoverflow.com/questions/56083725/macos-build-issues-lstdc-not-found-while-building-python-package @@ -1447,7 +1452,6 @@ tasks: template: verify-rc/github.osx.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_GO: 1 artifact: "source" @@ -1457,7 +1461,6 @@ tasks: template: verify-rc/github.osx.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_RUST: 1 artifact: "source" @@ -1466,15 +1469,17 @@ tasks: ci: github template: verify-rc/github.osx.yml params: + env: + INSTALL_NODE: 0 + TEST_DEFAULT: 0 + TEST_INTEGRATION: 1 artifact: "source" - flag: "TEST_INTEGRATION=1" verify-rc-source-linux-java: ci: github template: verify-rc/github.linux.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_JAVA: 1 artifact: "source" @@ -1484,7 +1489,6 @@ tasks: template: verify-rc/github.linux.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_CSHARP: 1 artifact: "source" @@ -1494,7 +1498,6 @@ tasks: template: verify-rc/github.linux.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_RUBY: 1 artifact: "source" @@ -1504,7 +1507,6 @@ tasks: template: verify-rc/github.linux.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_PYTHON: 1 artifact: "source" @@ -1524,7 +1526,6 @@ tasks: template: verify-rc/github.linux.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_GO: 1 artifact: "source" @@ -1534,7 +1535,6 @@ tasks: template: verify-rc/github.linux.yml params: env: - INSTALL_NODE: 0 TEST_DEFAULT: 0 TEST_RUST: 1 artifact: "source" From 7f2af92e19d173fdd4754bab4f9ec29704554959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 15 Oct 2020 15:55:19 +0200 Subject: [PATCH 15/15] fix env variable typo --- dev/tasks/tasks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index a156e3d0c81..d4fd68bd8ef 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1434,7 +1434,7 @@ tasks: TEST_DEFAULT: 0 TEST_PYTHON: 1 # https://stackoverflow.com/questions/56083725/macos-build-issues-lstdc-not-found-while-building-python-package - MACOS_DEPLOYMENT_TARGET: "10.15" + MACOSX_DEPLOYMENT_TARGET: "10.15" artifact: "source" verify-rc-source-macos-js: