ARROW-15693: [Dev] Update crossbow templates to use master or main#13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amol- merged 4 commits into from
Sep 6, 2022
Merged

ARROW-15693: [Dev] Update crossbow templates to use master or main #13975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af49822
1. Removed comment/text references to "master" branch, including URLs…
lafiona Aug 24, 2022
55a7e5d
Add Jira task ID ARROW-17552 to TODO comment for removing "master" fr…
kevingurney Aug 29, 2022
f49073e
1. Add Jira task ID ARROW-17552 to TODO comment for updating conditio…
kevingurney Aug 30, 2022
4575b26
1. Remove unnecessary import statement for jinja macros.
kevingurney Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions dev/archery/archery/crossbow/core.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -741,6 +741,9 @@ def __init__(self, head, branch, remote, version, email=None):
self.github_repo = "/".join(_parse_github_user_repo(remote))
self.version = version
self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
# TODO(ARROW-17552): Remove "master" from default_branch after
# migration to "main".
self.default_branch = ['main', 'master']
# Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
#
# > A pre-release version number MAY be denoted by appending an
Expand DownExpand Up@@ -778,6 +781,11 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
return cls(head=head, email=email, branch=branch, remote=remote,
version=version)

def is_default_branch(self):
# TODO(ARROW-17552): Switch the condition to "is" instead of "in"
# once "master" is removed from "default_branch".
return self.branch in self.default_branch


class Task(Serializable):
"""
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/conda-recipes/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,4 +64,4 @@ copied to the upstream feedstocks.

[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/.azure-pipelines/azure-pipelines-linux.yml#L12
21 changes: 19 additions & 2 deletions dev/tasks/conda-recipes/azure.clean.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
# 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.

jobs:
- job: linux
pool:
Expand All@@ -17,12 +34,12 @@ jobs:
displayName: Install requirements

- script: |
{% if arrow.branch == 'master' %}
{% if arrow.is_default_branch() %}
mkdir -p $HOME/.continuum/anaconda-client/tokens/
echo $(CROSSBOW_ANACONDA_TOKEN) > $HOME/.continuum/anaconda-client/tokens/https%3A%2F%2Fapi.anaconda.org.token
{% endif %}
eval "$(conda shell.bash hook)"
conda activate base
python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.branch == 'master' %}FORCE{% endif %}
python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.is_default_branch() %}FORCE{% endif %}
displayName: Delete outdated packages

2 changes: 1 addition & 1 deletion dev/tasks/docker-tests/github.linux.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ jobs:
path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
if-no-files-found: ignore

{% if arrow.branch == 'master' %}
{% if arrow.is_default_branch() %}
{{ macros.github_login_dockerhub()|indent }}
- name: Push Docker Image
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/homebrew-formulae/apache-arrow-glib.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow-glib.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow-glib.rb

class ApacheArrowGlib < Formula
desc "GLib bindings for Apache Arrow"
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/homebrew-formulae/apache-arrow.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow.rb

class ApacheArrow < Formula
desc "Columnar in-memory analytics layer designed to accelerate big data"
Expand Down
3 changes: 1 addition & 2 deletions dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# https://github.com/autobrew/homebrew-core/blob/master/Formula/apache-arrow.rb

# https://github.com/autobrew/homebrew-core/blob/-/Formula/apache-arrow.rb
class ApacheArrow < Formula
desc "Columnar in-memory analytics layer designed to accelerate big data"
homepage "https://arrow.apache.org/"
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/java-jars/github.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ jobs:
with:
name: ubuntu-shared-lib
path: arrow-shared-libs-linux.tar.gz
{% if arrow.branch == 'master' %}
{% if arrow.is_default_branch() %}
{{ macros.github_login_dockerhub()|indent }}
- name: Push Docker Image
shell: bash
Expand Down
10 changes: 5 additions & 5 deletions dev/tasks/macros.jinja
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ on:
{% endmacro %}

{%- macro github_upload_gemfury(pattern) -%}
{%- if arrow.branch == 'master' -%}
{%- if arrow.is_default_branch() -%}
- name: Upload package to Gemfury
shell: bash
run: |
Expand DownExpand Up@@ -157,7 +157,7 @@ on:
{% endmacro %}

{%- macro azure_upload_anaconda(pattern) -%}
{%- if arrow.branch == 'master' -%}
{%- if arrow.is_default_branch() -%}
- task: CondaEnvironment@1
inputs:
packageSpecs: 'anaconda-client'
Expand DownExpand Up@@ -216,7 +216,7 @@ on:
{% endmacro %}

{%- macro travis_upload_gemfury(pattern) -%}
{%- if arrow.branch == 'master' -%}
{%- if arrow.is_default_branch() -%}
- |
WHEEL_PATH=$(echo arrow/python/repaired_wheels/*.whl)
curl \
Expand All@@ -243,7 +243,7 @@ on:
continue
fi
# Pin the current commit in the formula to test so that
# we're not always pulling from master
# we're not always pulling from the tip of the default branch
sed -i '' -E \
-e 's@https://github.com/apache/arrow.git"$@{{ arrow.remote }}.git", revision: "{{ arrow.head }}"@' \
${formula}
Expand DownExpand Up@@ -284,7 +284,7 @@ on:
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
source("https://raw.githubusercontent.com/apache/arrow/master/ci/etc/rprofile")
source("https://raw.githubusercontent.com/apache/arrow/HEAD/ci/etc/rprofile")

install.packages(
"arrow",
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/nightlies.sample.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
# under the License.

# this travis configuration can be used to submit cron scheduled tasks
# 1. copy this file to one of crossbow's branch (master for example) with
# 1. copy this file to one of crossbow's branches with
# filename .travis.yml
# 2. setup daily cron jobs for that particular branch, see travis'
# documentation https://docs.travis-ci.com/user/cron-jobs/
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/python-sdist/github.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ jobs:
- name: Build sdist
run: |
archery docker run python-sdist
{% if arrow.branch == 'master' %}
{% if arrow.is_default_branch() %}
archery docker push python-sdist || :
{% endif %}
env:
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/python-wheels/github.linux.amd64.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ jobs:
{{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
{{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}

{% if arrow.branch == 'master' %}
{% if arrow.is_default_branch() %}
- name: Push Docker Image
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/python-wheels/github.windows.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
{{ macros.github_upload_releases("arrow/python/dist/*.whl")|indent }}
{{ macros.github_upload_gemfury("arrow/python/dist/*.whl")|indent }}

{% if arrow.branch == 'master' %}
{% if arrow.is_default_branch() %}
- name: Push Docker Image
shell: cmd
run: |
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/python-wheels/travis.linux.arm64.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ after_success:
{{ macros.travis_upload_releases("arrow/python/repaired_wheels/*.whl") }}
{{ macros.travis_upload_gemfury("arrow/python/repaired_wheels/*.whl") }}

{% if arrow.branch == 'master' %}
{% if arrow.is_default_branch() %}
# Push the docker image to dockerhub
- archery docker push python-wheel-manylinux-{{ manylinux_version }}
- archery docker push python-wheel-manylinux-test-unittests
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/r/github.linux.rchk.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ jobs:
docker run -v `pwd`/packages:/rchk/packages kalibera/rchk:latest /rchk/packages/arrow_*.tar.gz |& tee rchk.out
- name: Confirm that rchk has no errors
# Suspicious call, [UP], and [PB] are all of the error types currently at
# https://github.com/kalibera/cran-checks/tree/master/rchk/results
# https://github.com/kalibera/cran-checks/tree/HEAD/rchk/results
# though this might not be exhaustive, there does not appear to be a way to have rchk return an error code
# CRAN also will remove some of the outputs (especially those related to Rcpp and strptime, e.g.
# ERROR: too many states (abstraction error?))
Expand Down
2 changes: 2 additions & 0 deletions dev/tasks/r/github.macos.brew.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ jobs:

- name: Install apache-arrow
run: |
# TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
# after migrating the default branch to main.
# TODO(ARROW-16907): apache/arrow@master seems to be installed already
# so this does nothing on a branch/PR
brew install -v --HEAD apache-arrow
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/verify-rc/github.linux.amd64.docker.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ jobs:
-e TEST_{{ target|upper }}=1 \
{{ distro }}-verify-rc

{% if arrow.branch == 'master' %}
{% if arrow.is_default_branch() %}
{{ macros.github_login_dockerhub()|indent }}
- name: Push Docker Image
shell: bash
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-15693: [Dev] Update crossbow templates to use master or main#13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

amol-
merged 4 commits into

from

Sep 6, 2022
 Merged


ARROW-15693: [Dev] Update crossbow templates to use master or main
#13975
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
af49822

1. Removed comment/text references to "master" branch, including URLs…


lafiona Aug 24, 2022
55a7e5d

Add Jira task ID ARROW-17552 to TODO comment for removing "master" fr…


kevingurney Aug 29, 2022
f49073e

1. Add Jira task ID ARROW-17552 to TODO comment for updating conditio…


kevingurney Aug 30, 2022
4575b26

1. Remove unnecessary import statement for jinja macros.


kevingurney Aug 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
dev/archery/archery/crossbow/core.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -741,6 +741,9 @@ def __init__(self, head, branch, remote, version, email=None):
 self.github_repo = "/".join(_parse_github_user_repo(remote))
 self.version = version
 self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
 # TODO(ARROW-17552): Remove "master" from default_branch after
 # migration to "main".
 self.default_branch = ['main', 'master']
 # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
 #
 # > A pre-release version number MAY be denoted by appending an
Expand DownExpand Up@@ -778,6 +781,11 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
 return cls(head=head, email=email, branch=branch, remote=remote,
 version=version)

 def is_default_branch(self):
 # TODO(ARROW-17552): Switch the condition to "is" instead of "in"
 # once "master" is removed from "default_branch".
 return self.branch in self.default_branch


class Task(Serializable):
 """
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/conda-recipes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,4 +64,4 @@ copied to the upstream feedstocks.

[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/.azure-pipelines/azure-pipelines-linux.yml#L12

21 changes: 19 additions & 2 deletions
dev/tasks/conda-recipes/azure.clean.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
# 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.

jobs:
- job: linux
 pool:
Expand All@@ -17,12 +34,12 @@ jobs:
 displayName: Install requirements

 - script: |
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 mkdir -p $HOME/.continuum/anaconda-client/tokens/
 echo $(CROSSBOW_ANACONDA_TOKEN) > $HOME/.continuum/anaconda-client/tokens/https%3A%2F%2Fapi.anaconda.org.token
 {% endif %}
 eval "$(conda shell.bash hook)"
 conda activate base
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.branch == 'master' %}FORCE{% endif %}
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.is_default_branch() %}FORCE{% endif %}
 displayName: Delete outdated packages


2 changes: 1 addition & 1 deletion
dev/tasks/docker-tests/github.linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ jobs:
 path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
 if-no-files-found: ignore

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow-glib.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow-glib.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow-glib.rb

class ApacheArrowGlib < Formula
 desc "GLib bindings for Apache Arrow"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow.rb

class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
Expand Down

3 changes: 1 addition & 2 deletions
dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# https://github.com/autobrew/homebrew-core/blob/master/Formula/apache-arrow.rb

# https://github.com/autobrew/homebrew-core/blob/-/Formula/apache-arrow.rb
class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
 homepage "https://arrow.apache.org/"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/java-jars/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ jobs:
 with:
 name: ubuntu-shared-lib
 path: arrow-shared-libs-linux.tar.gz
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

10 changes: 5 additions & 5 deletions
dev/tasks/macros.jinja

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ on:
{% endmacro %}

{%- macro github_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - name: Upload package to Gemfury
 shell: bash
 run: |
Expand DownExpand Up@@ -157,7 +157,7 @@ on:
{% endmacro %}

{%- macro azure_upload_anaconda(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - task: CondaEnvironment@1
 inputs:
 packageSpecs: 'anaconda-client'
Expand DownExpand Up@@ -216,7 +216,7 @@ on:
{% endmacro %}

{%- macro travis_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - |
 WHEEL_PATH=$(echo arrow/python/repaired_wheels/*.whl)
 curl \
Expand All@@ -243,7 +243,7 @@ on:
 continue
 fi
 # Pin the current commit in the formula to test so that
 # we're not always pulling from master
 # we're not always pulling from the tip of the default branch
 sed -i '' -E \
 -e 's@https://github.com/apache/arrow.git"$@{{ arrow.remote }}.git", revision: "{{ arrow.head }}"@' \
 ${formula}
Expand DownExpand Up@@ -284,7 +284,7 @@ on:
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
 source("https://raw.githubusercontent.com/apache/arrow/master/ci/etc/rprofile")
 source("https://raw.githubusercontent.com/apache/arrow/HEAD/ci/etc/rprofile")

 install.packages(
 "arrow",
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/nightlies.sample.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
# under the License.

# this travis configuration can be used to submit cron scheduled tasks
# 1. copy this file to one of crossbow's branch (master for example) with
# 1. copy this file to one of crossbow's branches with
# filename .travis.yml
# 2. setup daily cron jobs for that particular branch, see travis'
# documentation https://docs.travis-ci.com/user/cron-jobs/
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-sdist/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ jobs:
 - name: Build sdist
 run: |
 archery docker run python-sdist
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 archery docker push python-sdist || :
 {% endif %}
 env:
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.linux.amd64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: bash
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/dist/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/dist/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: cmd
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/travis.linux.arm64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ after_success:
 {{ macros.travis_upload_releases("arrow/python/repaired_wheels/*.whl") }}
 {{ macros.travis_upload_gemfury("arrow/python/repaired_wheels/*.whl") }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 # Push the docker image to dockerhub
 - archery docker push python-wheel-manylinux-{{ manylinux_version }}
 - archery docker push python-wheel-manylinux-test-unittests
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/r/github.linux.rchk.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ jobs:
 docker run -v `pwd`/packages:/rchk/packages kalibera/rchk:latest /rchk/packages/arrow_*.tar.gz |& tee rchk.out
 - name: Confirm that rchk has no errors
 # Suspicious call, [UP], and [PB] are all of the error types currently at
 # https://github.com/kalibera/cran-checks/tree/master/rchk/results
 # https://github.com/kalibera/cran-checks/tree/HEAD/rchk/results
 # though this might not be exhaustive, there does not appear to be a way to have rchk return an error code
 # CRAN also will remove some of the outputs (especially those related to Rcpp and strptime, e.g.
 # ERROR: too many states (abstraction error?))
Expand Down

2 changes: 2 additions & 0 deletions
dev/tasks/r/github.macos.brew.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ jobs:

 - name: Install apache-arrow
 run: |
 # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
 # after migrating the default branch to main.
 # TODO(ARROW-16907): apache/arrow@master seems to be installed already
 # so this does nothing on a branch/PR
 brew install -v --HEAD apache-arrow
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/verify-rc/github.linux.amd64.docker.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ jobs:
 -e TEST_{{ target|upper }}=1 \
 {{ distro }}-verify-rc

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-15693: [Dev] Update crossbow templates to use master or main#13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

amol-
merged 4 commits into

from

Sep 6, 2022
 Merged


ARROW-15693: [Dev] Update crossbow templates to use master or main
#13975
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
af49822

1. Removed comment/text references to "master" branch, including URLs…


lafiona Aug 24, 2022
55a7e5d

Add Jira task ID ARROW-17552 to TODO comment for removing "master" fr…


kevingurney Aug 29, 2022
f49073e

1. Add Jira task ID ARROW-17552 to TODO comment for updating conditio…


kevingurney Aug 30, 2022
4575b26

1. Remove unnecessary import statement for jinja macros.


kevingurney Aug 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
dev/archery/archery/crossbow/core.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -741,6 +741,9 @@ def __init__(self, head, branch, remote, version, email=None):
 self.github_repo = "/".join(_parse_github_user_repo(remote))
 self.version = version
 self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
 # TODO(ARROW-17552): Remove "master" from default_branch after
 # migration to "main".
 self.default_branch = ['main', 'master']
 # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
 #
 # > A pre-release version number MAY be denoted by appending an
Expand DownExpand Up@@ -778,6 +781,11 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
 return cls(head=head, email=email, branch=branch, remote=remote,
 version=version)

 def is_default_branch(self):
 # TODO(ARROW-17552): Switch the condition to "is" instead of "in"
 # once "master" is removed from "default_branch".
 return self.branch in self.default_branch


class Task(Serializable):
 """
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/conda-recipes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,4 +64,4 @@ copied to the upstream feedstocks.

[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/.azure-pipelines/azure-pipelines-linux.yml#L12

21 changes: 19 additions & 2 deletions
dev/tasks/conda-recipes/azure.clean.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
# 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.

jobs:
- job: linux
 pool:
Expand All@@ -17,12 +34,12 @@ jobs:
 displayName: Install requirements

 - script: |
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 mkdir -p $HOME/.continuum/anaconda-client/tokens/
 echo $(CROSSBOW_ANACONDA_TOKEN) > $HOME/.continuum/anaconda-client/tokens/https%3A%2F%2Fapi.anaconda.org.token
 {% endif %}
 eval "$(conda shell.bash hook)"
 conda activate base
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.branch == 'master' %}FORCE{% endif %}
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.is_default_branch() %}FORCE{% endif %}
 displayName: Delete outdated packages


2 changes: 1 addition & 1 deletion
dev/tasks/docker-tests/github.linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ jobs:
 path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
 if-no-files-found: ignore

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow-glib.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow-glib.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow-glib.rb

class ApacheArrowGlib < Formula
 desc "GLib bindings for Apache Arrow"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow.rb

class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
Expand Down

3 changes: 1 addition & 2 deletions
dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# https://github.com/autobrew/homebrew-core/blob/master/Formula/apache-arrow.rb

# https://github.com/autobrew/homebrew-core/blob/-/Formula/apache-arrow.rb
class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
 homepage "https://arrow.apache.org/"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/java-jars/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ jobs:
 with:
 name: ubuntu-shared-lib
 path: arrow-shared-libs-linux.tar.gz
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

10 changes: 5 additions & 5 deletions
dev/tasks/macros.jinja

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ on:
{% endmacro %}

{%- macro github_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - name: Upload package to Gemfury
 shell: bash
 run: |
Expand DownExpand Up@@ -157,7 +157,7 @@ on:
{% endmacro %}

{%- macro azure_upload_anaconda(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - task: CondaEnvironment@1
 inputs:
 packageSpecs: 'anaconda-client'
Expand DownExpand Up@@ -216,7 +216,7 @@ on:
{% endmacro %}

{%- macro travis_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - |
 WHEEL_PATH=$(echo arrow/python/repaired_wheels/*.whl)
 curl \
Expand All@@ -243,7 +243,7 @@ on:
 continue
 fi
 # Pin the current commit in the formula to test so that
 # we're not always pulling from master
 # we're not always pulling from the tip of the default branch
 sed -i '' -E \
 -e 's@https://github.com/apache/arrow.git"$@{{ arrow.remote }}.git", revision: "{{ arrow.head }}"@' \
 ${formula}
Expand DownExpand Up@@ -284,7 +284,7 @@ on:
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
 source("https://raw.githubusercontent.com/apache/arrow/master/ci/etc/rprofile")
 source("https://raw.githubusercontent.com/apache/arrow/HEAD/ci/etc/rprofile")

 install.packages(
 "arrow",
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/nightlies.sample.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
# under the License.

# this travis configuration can be used to submit cron scheduled tasks
# 1. copy this file to one of crossbow's branch (master for example) with
# 1. copy this file to one of crossbow's branches with
# filename .travis.yml
# 2. setup daily cron jobs for that particular branch, see travis'
# documentation https://docs.travis-ci.com/user/cron-jobs/
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-sdist/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ jobs:
 - name: Build sdist
 run: |
 archery docker run python-sdist
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 archery docker push python-sdist || :
 {% endif %}
 env:
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.linux.amd64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: bash
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/dist/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/dist/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: cmd
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/travis.linux.arm64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ after_success:
 {{ macros.travis_upload_releases("arrow/python/repaired_wheels/*.whl") }}
 {{ macros.travis_upload_gemfury("arrow/python/repaired_wheels/*.whl") }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 # Push the docker image to dockerhub
 - archery docker push python-wheel-manylinux-{{ manylinux_version }}
 - archery docker push python-wheel-manylinux-test-unittests
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/r/github.linux.rchk.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ jobs:
 docker run -v `pwd`/packages:/rchk/packages kalibera/rchk:latest /rchk/packages/arrow_*.tar.gz |& tee rchk.out
 - name: Confirm that rchk has no errors
 # Suspicious call, [UP], and [PB] are all of the error types currently at
 # https://github.com/kalibera/cran-checks/tree/master/rchk/results
 # https://github.com/kalibera/cran-checks/tree/HEAD/rchk/results
 # though this might not be exhaustive, there does not appear to be a way to have rchk return an error code
 # CRAN also will remove some of the outputs (especially those related to Rcpp and strptime, e.g.
 # ERROR: too many states (abstraction error?))
Expand Down

2 changes: 2 additions & 0 deletions
dev/tasks/r/github.macos.brew.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ jobs:

 - name: Install apache-arrow
 run: |
 # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
 # after migrating the default branch to main.
 # TODO(ARROW-16907): apache/arrow@master seems to be installed already
 # so this does nothing on a branch/PR
 brew install -v --HEAD apache-arrow
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/verify-rc/github.linux.amd64.docker.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ jobs:
 -e TEST_{{ target|upper }}=1 \
 {{ distro }}-verify-rc

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-15693: [Dev] Update crossbow templates to use master or main#13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

amol-
merged 4 commits into

from

Sep 6, 2022
 Merged


ARROW-15693: [Dev] Update crossbow templates to use master or main
#13975
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
af49822

1. Removed comment/text references to "master" branch, including URLs…


lafiona Aug 24, 2022
55a7e5d

Add Jira task ID ARROW-17552 to TODO comment for removing "master" fr…


kevingurney Aug 29, 2022
f49073e

1. Add Jira task ID ARROW-17552 to TODO comment for updating conditio…


kevingurney Aug 30, 2022
4575b26

1. Remove unnecessary import statement for jinja macros.


kevingurney Aug 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
dev/archery/archery/crossbow/core.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -741,6 +741,9 @@ def __init__(self, head, branch, remote, version, email=None):
 self.github_repo = "/".join(_parse_github_user_repo(remote))
 self.version = version
 self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
 # TODO(ARROW-17552): Remove "master" from default_branch after
 # migration to "main".
 self.default_branch = ['main', 'master']
 # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
 #
 # > A pre-release version number MAY be denoted by appending an
Expand DownExpand Up@@ -778,6 +781,11 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
 return cls(head=head, email=email, branch=branch, remote=remote,
 version=version)

 def is_default_branch(self):
 # TODO(ARROW-17552): Switch the condition to "is" instead of "in"
 # once "master" is removed from "default_branch".
 return self.branch in self.default_branch


class Task(Serializable):
 """
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/conda-recipes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,4 +64,4 @@ copied to the upstream feedstocks.

[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/.azure-pipelines/azure-pipelines-linux.yml#L12

21 changes: 19 additions & 2 deletions
dev/tasks/conda-recipes/azure.clean.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
# 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.

jobs:
- job: linux
 pool:
Expand All@@ -17,12 +34,12 @@ jobs:
 displayName: Install requirements

 - script: |
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 mkdir -p $HOME/.continuum/anaconda-client/tokens/
 echo $(CROSSBOW_ANACONDA_TOKEN) > $HOME/.continuum/anaconda-client/tokens/https%3A%2F%2Fapi.anaconda.org.token
 {% endif %}
 eval "$(conda shell.bash hook)"
 conda activate base
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.branch == 'master' %}FORCE{% endif %}
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.is_default_branch() %}FORCE{% endif %}
 displayName: Delete outdated packages


2 changes: 1 addition & 1 deletion
dev/tasks/docker-tests/github.linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ jobs:
 path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
 if-no-files-found: ignore

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow-glib.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow-glib.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow-glib.rb

class ApacheArrowGlib < Formula
 desc "GLib bindings for Apache Arrow"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow.rb

class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
Expand Down

3 changes: 1 addition & 2 deletions
dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# https://github.com/autobrew/homebrew-core/blob/master/Formula/apache-arrow.rb

# https://github.com/autobrew/homebrew-core/blob/-/Formula/apache-arrow.rb
class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
 homepage "https://arrow.apache.org/"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/java-jars/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ jobs:
 with:
 name: ubuntu-shared-lib
 path: arrow-shared-libs-linux.tar.gz
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

10 changes: 5 additions & 5 deletions
dev/tasks/macros.jinja

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ on:
{% endmacro %}

{%- macro github_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - name: Upload package to Gemfury
 shell: bash
 run: |
Expand DownExpand Up@@ -157,7 +157,7 @@ on:
{% endmacro %}

{%- macro azure_upload_anaconda(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - task: CondaEnvironment@1
 inputs:
 packageSpecs: 'anaconda-client'
Expand DownExpand Up@@ -216,7 +216,7 @@ on:
{% endmacro %}

{%- macro travis_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - |
 WHEEL_PATH=$(echo arrow/python/repaired_wheels/*.whl)
 curl \
Expand All@@ -243,7 +243,7 @@ on:
 continue
 fi
 # Pin the current commit in the formula to test so that
 # we're not always pulling from master
 # we're not always pulling from the tip of the default branch
 sed -i '' -E \
 -e 's@https://github.com/apache/arrow.git"$@{{ arrow.remote }}.git", revision: "{{ arrow.head }}"@' \
 ${formula}
Expand DownExpand Up@@ -284,7 +284,7 @@ on:
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
 source("https://raw.githubusercontent.com/apache/arrow/master/ci/etc/rprofile")
 source("https://raw.githubusercontent.com/apache/arrow/HEAD/ci/etc/rprofile")

 install.packages(
 "arrow",
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/nightlies.sample.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
# under the License.

# this travis configuration can be used to submit cron scheduled tasks
# 1. copy this file to one of crossbow's branch (master for example) with
# 1. copy this file to one of crossbow's branches with
# filename .travis.yml
# 2. setup daily cron jobs for that particular branch, see travis'
# documentation https://docs.travis-ci.com/user/cron-jobs/
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-sdist/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ jobs:
 - name: Build sdist
 run: |
 archery docker run python-sdist
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 archery docker push python-sdist || :
 {% endif %}
 env:
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.linux.amd64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: bash
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/dist/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/dist/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: cmd
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/travis.linux.arm64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ after_success:
 {{ macros.travis_upload_releases("arrow/python/repaired_wheels/*.whl") }}
 {{ macros.travis_upload_gemfury("arrow/python/repaired_wheels/*.whl") }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 # Push the docker image to dockerhub
 - archery docker push python-wheel-manylinux-{{ manylinux_version }}
 - archery docker push python-wheel-manylinux-test-unittests
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/r/github.linux.rchk.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ jobs:
 docker run -v `pwd`/packages:/rchk/packages kalibera/rchk:latest /rchk/packages/arrow_*.tar.gz |& tee rchk.out
 - name: Confirm that rchk has no errors
 # Suspicious call, [UP], and [PB] are all of the error types currently at
 # https://github.com/kalibera/cran-checks/tree/master/rchk/results
 # https://github.com/kalibera/cran-checks/tree/HEAD/rchk/results
 # though this might not be exhaustive, there does not appear to be a way to have rchk return an error code
 # CRAN also will remove some of the outputs (especially those related to Rcpp and strptime, e.g.
 # ERROR: too many states (abstraction error?))
Expand Down

2 changes: 2 additions & 0 deletions
dev/tasks/r/github.macos.brew.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ jobs:

 - name: Install apache-arrow
 run: |
 # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
 # after migrating the default branch to main.
 # TODO(ARROW-16907): apache/arrow@master seems to be installed already
 # so this does nothing on a branch/PR
 brew install -v --HEAD apache-arrow
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/verify-rc/github.linux.amd64.docker.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ jobs:
 -e TEST_{{ target|upper }}=1 \
 {{ distro }}-verify-rc

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-15693: [Dev] Update crossbow templates to use master or main#13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

amol-
merged 4 commits into

from

Sep 6, 2022
 Merged


ARROW-15693: [Dev] Update crossbow templates to use master or main
#13975
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
af49822

1. Removed comment/text references to "master" branch, including URLs…


lafiona Aug 24, 2022
55a7e5d

Add Jira task ID ARROW-17552 to TODO comment for removing "master" fr…


kevingurney Aug 29, 2022
f49073e

1. Add Jira task ID ARROW-17552 to TODO comment for updating conditio…


kevingurney Aug 30, 2022
4575b26

1. Remove unnecessary import statement for jinja macros.


kevingurney Aug 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
dev/archery/archery/crossbow/core.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -741,6 +741,9 @@ def __init__(self, head, branch, remote, version, email=None):
 self.github_repo = "/".join(_parse_github_user_repo(remote))
 self.version = version
 self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
 # TODO(ARROW-17552): Remove "master" from default_branch after
 # migration to "main".
 self.default_branch = ['main', 'master']
 # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
 #
 # > A pre-release version number MAY be denoted by appending an
Expand DownExpand Up@@ -778,6 +781,11 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
 return cls(head=head, email=email, branch=branch, remote=remote,
 version=version)

 def is_default_branch(self):
 # TODO(ARROW-17552): Switch the condition to "is" instead of "in"
 # once "master" is removed from "default_branch".
 return self.branch in self.default_branch


class Task(Serializable):
 """
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/conda-recipes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,4 +64,4 @@ copied to the upstream feedstocks.

[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/.azure-pipelines/azure-pipelines-linux.yml#L12

21 changes: 19 additions & 2 deletions
dev/tasks/conda-recipes/azure.clean.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
# 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.

jobs:
- job: linux
 pool:
Expand All@@ -17,12 +34,12 @@ jobs:
 displayName: Install requirements

 - script: |
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 mkdir -p $HOME/.continuum/anaconda-client/tokens/
 echo $(CROSSBOW_ANACONDA_TOKEN) > $HOME/.continuum/anaconda-client/tokens/https%3A%2F%2Fapi.anaconda.org.token
 {% endif %}
 eval "$(conda shell.bash hook)"
 conda activate base
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.branch == 'master' %}FORCE{% endif %}
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.is_default_branch() %}FORCE{% endif %}
 displayName: Delete outdated packages


2 changes: 1 addition & 1 deletion
dev/tasks/docker-tests/github.linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ jobs:
 path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
 if-no-files-found: ignore

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow-glib.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow-glib.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow-glib.rb

class ApacheArrowGlib < Formula
 desc "GLib bindings for Apache Arrow"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow.rb

class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
Expand Down

3 changes: 1 addition & 2 deletions
dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# https://github.com/autobrew/homebrew-core/blob/master/Formula/apache-arrow.rb

# https://github.com/autobrew/homebrew-core/blob/-/Formula/apache-arrow.rb
class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
 homepage "https://arrow.apache.org/"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/java-jars/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ jobs:
 with:
 name: ubuntu-shared-lib
 path: arrow-shared-libs-linux.tar.gz
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

10 changes: 5 additions & 5 deletions
dev/tasks/macros.jinja

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ on:
{% endmacro %}

{%- macro github_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - name: Upload package to Gemfury
 shell: bash
 run: |
Expand DownExpand Up@@ -157,7 +157,7 @@ on:
{% endmacro %}

{%- macro azure_upload_anaconda(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - task: CondaEnvironment@1
 inputs:
 packageSpecs: 'anaconda-client'
Expand DownExpand Up@@ -216,7 +216,7 @@ on:
{% endmacro %}

{%- macro travis_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - |
 WHEEL_PATH=$(echo arrow/python/repaired_wheels/*.whl)
 curl \
Expand All@@ -243,7 +243,7 @@ on:
 continue
 fi
 # Pin the current commit in the formula to test so that
 # we're not always pulling from master
 # we're not always pulling from the tip of the default branch
 sed -i '' -E \
 -e 's@https://github.com/apache/arrow.git"$@{{ arrow.remote }}.git", revision: "{{ arrow.head }}"@' \
 ${formula}
Expand DownExpand Up@@ -284,7 +284,7 @@ on:
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
 source("https://raw.githubusercontent.com/apache/arrow/master/ci/etc/rprofile")
 source("https://raw.githubusercontent.com/apache/arrow/HEAD/ci/etc/rprofile")

 install.packages(
 "arrow",
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/nightlies.sample.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
# under the License.

# this travis configuration can be used to submit cron scheduled tasks
# 1. copy this file to one of crossbow's branch (master for example) with
# 1. copy this file to one of crossbow's branches with
# filename .travis.yml
# 2. setup daily cron jobs for that particular branch, see travis'
# documentation https://docs.travis-ci.com/user/cron-jobs/
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-sdist/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ jobs:
 - name: Build sdist
 run: |
 archery docker run python-sdist
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 archery docker push python-sdist || :
 {% endif %}
 env:
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.linux.amd64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: bash
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/dist/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/dist/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: cmd
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/travis.linux.arm64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ after_success:
 {{ macros.travis_upload_releases("arrow/python/repaired_wheels/*.whl") }}
 {{ macros.travis_upload_gemfury("arrow/python/repaired_wheels/*.whl") }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 # Push the docker image to dockerhub
 - archery docker push python-wheel-manylinux-{{ manylinux_version }}
 - archery docker push python-wheel-manylinux-test-unittests
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/r/github.linux.rchk.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ jobs:
 docker run -v `pwd`/packages:/rchk/packages kalibera/rchk:latest /rchk/packages/arrow_*.tar.gz |& tee rchk.out
 - name: Confirm that rchk has no errors
 # Suspicious call, [UP], and [PB] are all of the error types currently at
 # https://github.com/kalibera/cran-checks/tree/master/rchk/results
 # https://github.com/kalibera/cran-checks/tree/HEAD/rchk/results
 # though this might not be exhaustive, there does not appear to be a way to have rchk return an error code
 # CRAN also will remove some of the outputs (especially those related to Rcpp and strptime, e.g.
 # ERROR: too many states (abstraction error?))
Expand Down

2 changes: 2 additions & 0 deletions
dev/tasks/r/github.macos.brew.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ jobs:

 - name: Install apache-arrow
 run: |
 # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
 # after migrating the default branch to main.
 # TODO(ARROW-16907): apache/arrow@master seems to be installed already
 # so this does nothing on a branch/PR
 brew install -v --HEAD apache-arrow
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/verify-rc/github.linux.amd64.docker.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ jobs:
 -e TEST_{{ target|upper }}=1 \
 {{ distro }}-verify-rc

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-15693: [Dev] Update crossbow templates to use master or main#13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

amol-
merged 4 commits into

from

Sep 6, 2022
 Merged


ARROW-15693: [Dev] Update crossbow templates to use master or main
#13975
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
af49822

1. Removed comment/text references to "master" branch, including URLs…


lafiona Aug 24, 2022
55a7e5d

Add Jira task ID ARROW-17552 to TODO comment for removing "master" fr…


kevingurney Aug 29, 2022
f49073e

1. Add Jira task ID ARROW-17552 to TODO comment for updating conditio…


kevingurney Aug 30, 2022
4575b26

1. Remove unnecessary import statement for jinja macros.


kevingurney Aug 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
dev/archery/archery/crossbow/core.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -741,6 +741,9 @@ def __init__(self, head, branch, remote, version, email=None):
 self.github_repo = "/".join(_parse_github_user_repo(remote))
 self.version = version
 self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
 # TODO(ARROW-17552): Remove "master" from default_branch after
 # migration to "main".
 self.default_branch = ['main', 'master']
 # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
 #
 # > A pre-release version number MAY be denoted by appending an
Expand DownExpand Up@@ -778,6 +781,11 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
 return cls(head=head, email=email, branch=branch, remote=remote,
 version=version)

 def is_default_branch(self):
 # TODO(ARROW-17552): Switch the condition to "is" instead of "in"
 # once "master" is removed from "default_branch".
 return self.branch in self.default_branch


class Task(Serializable):
 """
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/conda-recipes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,4 +64,4 @@ copied to the upstream feedstocks.

[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/.azure-pipelines/azure-pipelines-linux.yml#L12

21 changes: 19 additions & 2 deletions
dev/tasks/conda-recipes/azure.clean.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
# 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.

jobs:
- job: linux
 pool:
Expand All@@ -17,12 +34,12 @@ jobs:
 displayName: Install requirements

 - script: |
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 mkdir -p $HOME/.continuum/anaconda-client/tokens/
 echo $(CROSSBOW_ANACONDA_TOKEN) > $HOME/.continuum/anaconda-client/tokens/https%3A%2F%2Fapi.anaconda.org.token
 {% endif %}
 eval "$(conda shell.bash hook)"
 conda activate base
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.branch == 'master' %}FORCE{% endif %}
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.is_default_branch() %}FORCE{% endif %}
 displayName: Delete outdated packages


2 changes: 1 addition & 1 deletion
dev/tasks/docker-tests/github.linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ jobs:
 path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
 if-no-files-found: ignore

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow-glib.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow-glib.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow-glib.rb

class ApacheArrowGlib < Formula
 desc "GLib bindings for Apache Arrow"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow.rb

class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
Expand Down

3 changes: 1 addition & 2 deletions
dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# https://github.com/autobrew/homebrew-core/blob/master/Formula/apache-arrow.rb

# https://github.com/autobrew/homebrew-core/blob/-/Formula/apache-arrow.rb
class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
 homepage "https://arrow.apache.org/"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/java-jars/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ jobs:
 with:
 name: ubuntu-shared-lib
 path: arrow-shared-libs-linux.tar.gz
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

10 changes: 5 additions & 5 deletions
dev/tasks/macros.jinja

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ on:
{% endmacro %}

{%- macro github_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - name: Upload package to Gemfury
 shell: bash
 run: |
Expand DownExpand Up@@ -157,7 +157,7 @@ on:
{% endmacro %}

{%- macro azure_upload_anaconda(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - task: CondaEnvironment@1
 inputs:
 packageSpecs: 'anaconda-client'
Expand DownExpand Up@@ -216,7 +216,7 @@ on:
{% endmacro %}

{%- macro travis_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - |
 WHEEL_PATH=$(echo arrow/python/repaired_wheels/*.whl)
 curl \
Expand All@@ -243,7 +243,7 @@ on:
 continue
 fi
 # Pin the current commit in the formula to test so that
 # we're not always pulling from master
 # we're not always pulling from the tip of the default branch
 sed -i '' -E \
 -e 's@https://github.com/apache/arrow.git"$@{{ arrow.remote }}.git", revision: "{{ arrow.head }}"@' \
 ${formula}
Expand DownExpand Up@@ -284,7 +284,7 @@ on:
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
 source("https://raw.githubusercontent.com/apache/arrow/master/ci/etc/rprofile")
 source("https://raw.githubusercontent.com/apache/arrow/HEAD/ci/etc/rprofile")

 install.packages(
 "arrow",
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/nightlies.sample.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
# under the License.

# this travis configuration can be used to submit cron scheduled tasks
# 1. copy this file to one of crossbow's branch (master for example) with
# 1. copy this file to one of crossbow's branches with
# filename .travis.yml
# 2. setup daily cron jobs for that particular branch, see travis'
# documentation https://docs.travis-ci.com/user/cron-jobs/
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-sdist/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ jobs:
 - name: Build sdist
 run: |
 archery docker run python-sdist
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 archery docker push python-sdist || :
 {% endif %}
 env:
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.linux.amd64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: bash
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/dist/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/dist/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: cmd
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/travis.linux.arm64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ after_success:
 {{ macros.travis_upload_releases("arrow/python/repaired_wheels/*.whl") }}
 {{ macros.travis_upload_gemfury("arrow/python/repaired_wheels/*.whl") }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 # Push the docker image to dockerhub
 - archery docker push python-wheel-manylinux-{{ manylinux_version }}
 - archery docker push python-wheel-manylinux-test-unittests
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/r/github.linux.rchk.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ jobs:
 docker run -v `pwd`/packages:/rchk/packages kalibera/rchk:latest /rchk/packages/arrow_*.tar.gz |& tee rchk.out
 - name: Confirm that rchk has no errors
 # Suspicious call, [UP], and [PB] are all of the error types currently at
 # https://github.com/kalibera/cran-checks/tree/master/rchk/results
 # https://github.com/kalibera/cran-checks/tree/HEAD/rchk/results
 # though this might not be exhaustive, there does not appear to be a way to have rchk return an error code
 # CRAN also will remove some of the outputs (especially those related to Rcpp and strptime, e.g.
 # ERROR: too many states (abstraction error?))
Expand Down

2 changes: 2 additions & 0 deletions
dev/tasks/r/github.macos.brew.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ jobs:

 - name: Install apache-arrow
 run: |
 # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
 # after migrating the default branch to main.
 # TODO(ARROW-16907): apache/arrow@master seems to be installed already
 # so this does nothing on a branch/PR
 brew install -v --HEAD apache-arrow
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/verify-rc/github.linux.amd64.docker.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ jobs:
 -e TEST_{{ target|upper }}=1 \
 {{ distro }}-verify-rc

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-15693: [Dev] Update crossbow templates to use master or main#13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

amol-
merged 4 commits into

from

Sep 6, 2022
 Merged


ARROW-15693: [Dev] Update crossbow templates to use master or main
#13975
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
af49822

1. Removed comment/text references to "master" branch, including URLs…


lafiona Aug 24, 2022
55a7e5d

Add Jira task ID ARROW-17552 to TODO comment for removing "master" fr…


kevingurney Aug 29, 2022
f49073e

1. Add Jira task ID ARROW-17552 to TODO comment for updating conditio…


kevingurney Aug 30, 2022
4575b26

1. Remove unnecessary import statement for jinja macros.


kevingurney Aug 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
dev/archery/archery/crossbow/core.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -741,6 +741,9 @@ def __init__(self, head, branch, remote, version, email=None):
 self.github_repo = "/".join(_parse_github_user_repo(remote))
 self.version = version
 self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
 # TODO(ARROW-17552): Remove "master" from default_branch after
 # migration to "main".
 self.default_branch = ['main', 'master']
 # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
 #
 # > A pre-release version number MAY be denoted by appending an
Expand DownExpand Up@@ -778,6 +781,11 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
 return cls(head=head, email=email, branch=branch, remote=remote,
 version=version)

 def is_default_branch(self):
 # TODO(ARROW-17552): Switch the condition to "is" instead of "in"
 # once "master" is removed from "default_branch".
 return self.branch in self.default_branch


class Task(Serializable):
 """
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/conda-recipes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,4 +64,4 @@ copied to the upstream feedstocks.

[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/.azure-pipelines/azure-pipelines-linux.yml#L12

21 changes: 19 additions & 2 deletions
dev/tasks/conda-recipes/azure.clean.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
# 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.

jobs:
- job: linux
 pool:
Expand All@@ -17,12 +34,12 @@ jobs:
 displayName: Install requirements

 - script: |
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 mkdir -p $HOME/.continuum/anaconda-client/tokens/
 echo $(CROSSBOW_ANACONDA_TOKEN) > $HOME/.continuum/anaconda-client/tokens/https%3A%2F%2Fapi.anaconda.org.token
 {% endif %}
 eval "$(conda shell.bash hook)"
 conda activate base
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.branch == 'master' %}FORCE{% endif %}
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.is_default_branch() %}FORCE{% endif %}
 displayName: Delete outdated packages


2 changes: 1 addition & 1 deletion
dev/tasks/docker-tests/github.linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ jobs:
 path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
 if-no-files-found: ignore

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow-glib.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow-glib.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow-glib.rb

class ApacheArrowGlib < Formula
 desc "GLib bindings for Apache Arrow"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow.rb

class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
Expand Down

3 changes: 1 addition & 2 deletions
dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# https://github.com/autobrew/homebrew-core/blob/master/Formula/apache-arrow.rb

# https://github.com/autobrew/homebrew-core/blob/-/Formula/apache-arrow.rb
class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
 homepage "https://arrow.apache.org/"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/java-jars/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ jobs:
 with:
 name: ubuntu-shared-lib
 path: arrow-shared-libs-linux.tar.gz
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

10 changes: 5 additions & 5 deletions
dev/tasks/macros.jinja

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ on:
{% endmacro %}

{%- macro github_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - name: Upload package to Gemfury
 shell: bash
 run: |
Expand DownExpand Up@@ -157,7 +157,7 @@ on:
{% endmacro %}

{%- macro azure_upload_anaconda(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - task: CondaEnvironment@1
 inputs:
 packageSpecs: 'anaconda-client'
Expand DownExpand Up@@ -216,7 +216,7 @@ on:
{% endmacro %}

{%- macro travis_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - |
 WHEEL_PATH=$(echo arrow/python/repaired_wheels/*.whl)
 curl \
Expand All@@ -243,7 +243,7 @@ on:
 continue
 fi
 # Pin the current commit in the formula to test so that
 # we're not always pulling from master
 # we're not always pulling from the tip of the default branch
 sed -i '' -E \
 -e 's@https://github.com/apache/arrow.git"$@{{ arrow.remote }}.git", revision: "{{ arrow.head }}"@' \
 ${formula}
Expand DownExpand Up@@ -284,7 +284,7 @@ on:
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
 source("https://raw.githubusercontent.com/apache/arrow/master/ci/etc/rprofile")
 source("https://raw.githubusercontent.com/apache/arrow/HEAD/ci/etc/rprofile")

 install.packages(
 "arrow",
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/nightlies.sample.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
# under the License.

# this travis configuration can be used to submit cron scheduled tasks
# 1. copy this file to one of crossbow's branch (master for example) with
# 1. copy this file to one of crossbow's branches with
# filename .travis.yml
# 2. setup daily cron jobs for that particular branch, see travis'
# documentation https://docs.travis-ci.com/user/cron-jobs/
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-sdist/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ jobs:
 - name: Build sdist
 run: |
 archery docker run python-sdist
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 archery docker push python-sdist || :
 {% endif %}
 env:
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.linux.amd64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: bash
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/dist/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/dist/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: cmd
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/travis.linux.arm64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ after_success:
 {{ macros.travis_upload_releases("arrow/python/repaired_wheels/*.whl") }}
 {{ macros.travis_upload_gemfury("arrow/python/repaired_wheels/*.whl") }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 # Push the docker image to dockerhub
 - archery docker push python-wheel-manylinux-{{ manylinux_version }}
 - archery docker push python-wheel-manylinux-test-unittests
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/r/github.linux.rchk.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ jobs:
 docker run -v `pwd`/packages:/rchk/packages kalibera/rchk:latest /rchk/packages/arrow_*.tar.gz |& tee rchk.out
 - name: Confirm that rchk has no errors
 # Suspicious call, [UP], and [PB] are all of the error types currently at
 # https://github.com/kalibera/cran-checks/tree/master/rchk/results
 # https://github.com/kalibera/cran-checks/tree/HEAD/rchk/results
 # though this might not be exhaustive, there does not appear to be a way to have rchk return an error code
 # CRAN also will remove some of the outputs (especially those related to Rcpp and strptime, e.g.
 # ERROR: too many states (abstraction error?))
Expand Down

2 changes: 2 additions & 0 deletions
dev/tasks/r/github.macos.brew.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ jobs:

 - name: Install apache-arrow
 run: |
 # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
 # after migrating the default branch to main.
 # TODO(ARROW-16907): apache/arrow@master seems to be installed already
 # so this does nothing on a branch/PR
 brew install -v --HEAD apache-arrow
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/verify-rc/github.linux.amd64.docker.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ jobs:
 -e TEST_{{ target|upper }}=1 \
 {{ distro }}-verify-rc

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-15693: [Dev] Update crossbow templates to use master or main#13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

amol-
merged 4 commits into

from

Sep 6, 2022
 Merged


ARROW-15693: [Dev] Update crossbow templates to use master or main
#13975
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
af49822

1. Removed comment/text references to "master" branch, including URLs…


lafiona Aug 24, 2022
55a7e5d

Add Jira task ID ARROW-17552 to TODO comment for removing "master" fr…


kevingurney Aug 29, 2022
f49073e

1. Add Jira task ID ARROW-17552 to TODO comment for updating conditio…


kevingurney Aug 30, 2022
4575b26

1. Remove unnecessary import statement for jinja macros.


kevingurney Aug 31, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 8 additions & 0 deletions
dev/archery/archery/crossbow/core.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -741,6 +741,9 @@ def __init__(self, head, branch, remote, version, email=None):
 self.github_repo = "/".join(_parse_github_user_repo(remote))
 self.version = version
 self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
 # TODO(ARROW-17552): Remove "master" from default_branch after
 # migration to "main".
 self.default_branch = ['main', 'master']
 # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
 #
 # > A pre-release version number MAY be denoted by appending an
Expand DownExpand Up@@ -778,6 +781,11 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
 return cls(head=head, email=email, branch=branch, remote=remote,
 version=version)

 def is_default_branch(self):
 # TODO(ARROW-17552): Switch the condition to "is" instead of "in"
 # once "master" is removed from "default_branch".
 return self.branch in self.default_branch


class Task(Serializable):
 """
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/conda-recipes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,4 +64,4 @@ copied to the upstream feedstocks.

[arrow-cpp-feedstock]: https://github.com/conda-forge/arrow-cpp-feedstock
[parquet-cpp-feedstock]: https://github.com/conda-forge/parquet-cpp-feedstock
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/master/.azure-pipelines/azure-pipelines-linux.yml#L12
[matrix-definition]: https://github.com/conda-forge/arrow-cpp-feedstock/blob/main/.azure-pipelines/azure-pipelines-linux.yml#L12

21 changes: 19 additions & 2 deletions
dev/tasks/conda-recipes/azure.clean.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
# 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.

jobs:
- job: linux
 pool:
Expand All@@ -17,12 +34,12 @@ jobs:
 displayName: Install requirements

 - script: |
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 mkdir -p $HOME/.continuum/anaconda-client/tokens/
 echo $(CROSSBOW_ANACONDA_TOKEN) > $HOME/.continuum/anaconda-client/tokens/https%3A%2F%2Fapi.anaconda.org.token
 {% endif %}
 eval "$(conda shell.bash hook)"
 conda activate base
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.branch == 'master' %}FORCE{% endif %}
 python3 arrow/dev/tasks/conda-recipes/clean.py {% if arrow.is_default_branch() %}FORCE{% endif %}
 displayName: Delete outdated packages


2 changes: 1 addition & 1 deletion
dev/tasks/docker-tests/github.linux.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ jobs:
 path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
 if-no-files-found: ignore

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow-glib.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow-glib.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow-glib.rb

class ApacheArrowGlib < Formula
 desc "GLib bindings for Apache Arrow"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/homebrew-formulae/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# https://github.com/Homebrew/homebrew-core/blob/master/Formula/apache-arrow.rb
# https://github.com/Homebrew/homebrew-core/blob/-/Formula/apache-arrow.rb

class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
Expand Down

3 changes: 1 addition & 2 deletions
dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# https://github.com/autobrew/homebrew-core/blob/master/Formula/apache-arrow.rb

# https://github.com/autobrew/homebrew-core/blob/-/Formula/apache-arrow.rb
class ApacheArrow < Formula
 desc "Columnar in-memory analytics layer designed to accelerate big data"
 homepage "https://arrow.apache.org/"
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/java-jars/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ jobs:
 with:
 name: ubuntu-shared-lib
 path: arrow-shared-libs-linux.tar.gz
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down

10 changes: 5 additions & 5 deletions
dev/tasks/macros.jinja

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ on:
{% endmacro %}

{%- macro github_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - name: Upload package to Gemfury
 shell: bash
 run: |
Expand DownExpand Up@@ -157,7 +157,7 @@ on:
{% endmacro %}

{%- macro azure_upload_anaconda(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - task: CondaEnvironment@1
 inputs:
 packageSpecs: 'anaconda-client'
Expand DownExpand Up@@ -216,7 +216,7 @@ on:
{% endmacro %}

{%- macro travis_upload_gemfury(pattern) -%}
 {%- if arrow.branch == 'master' -%}
 {%- if arrow.is_default_branch() -%}
 - |
 WHEEL_PATH=$(echo arrow/python/repaired_wheels/*.whl)
 curl \
Expand All@@ -243,7 +243,7 @@ on:
 continue
 fi
 # Pin the current commit in the formula to test so that
 # we're not always pulling from master
 # we're not always pulling from the tip of the default branch
 sed -i '' -E \
 -e 's@https://github.com/apache/arrow.git"$@{{ arrow.remote }}.git", revision: "{{ arrow.head }}"@' \
 ${formula}
Expand DownExpand Up@@ -284,7 +284,7 @@ on:
{% endmacro %}

{%- macro github_test_r_src_pkg() -%}
 source("https://raw.githubusercontent.com/apache/arrow/master/ci/etc/rprofile")
 source("https://raw.githubusercontent.com/apache/arrow/HEAD/ci/etc/rprofile")

 install.packages(
 "arrow",
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/nightlies.sample.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
# under the License.

# this travis configuration can be used to submit cron scheduled tasks
# 1. copy this file to one of crossbow's branch (master for example) with
# 1. copy this file to one of crossbow's branches with
# filename .travis.yml
# 2. setup daily cron jobs for that particular branch, see travis'
# documentation https://docs.travis-ci.com/user/cron-jobs/
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-sdist/github.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ jobs:
 - name: Build sdist
 run: |
 archery docker run python-sdist
 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 archery docker push python-sdist || :
 {% endif %}
 env:
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.linux.amd64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/repaired_wheels/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: bash
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/github.windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 {{ macros.github_upload_releases("arrow/python/dist/*.whl")|indent }}
 {{ macros.github_upload_gemfury("arrow/python/dist/*.whl")|indent }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 - name: Push Docker Image
 shell: cmd
 run: |
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/python-wheels/travis.linux.arm64.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ after_success:
 {{ macros.travis_upload_releases("arrow/python/repaired_wheels/*.whl") }}
 {{ macros.travis_upload_gemfury("arrow/python/repaired_wheels/*.whl") }}

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 # Push the docker image to dockerhub
 - archery docker push python-wheel-manylinux-{{ manylinux_version }}
 - archery docker push python-wheel-manylinux-test-unittests
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/r/github.linux.rchk.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ jobs:
 docker run -v `pwd`/packages:/rchk/packages kalibera/rchk:latest /rchk/packages/arrow_*.tar.gz |& tee rchk.out
 - name: Confirm that rchk has no errors
 # Suspicious call, [UP], and [PB] are all of the error types currently at
 # https://github.com/kalibera/cran-checks/tree/master/rchk/results
 # https://github.com/kalibera/cran-checks/tree/HEAD/rchk/results
 # though this might not be exhaustive, there does not appear to be a way to have rchk return an error code
 # CRAN also will remove some of the outputs (especially those related to Rcpp and strptime, e.g.
 # ERROR: too many states (abstraction error?))
Expand Down

2 changes: 2 additions & 0 deletions
dev/tasks/r/github.macos.brew.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ jobs:

 - name: Install apache-arrow
 run: |
 # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
 # after migrating the default branch to main.
 # TODO(ARROW-16907): apache/arrow@master seems to be installed already
 # so this does nothing on a branch/PR
 brew install -v --HEAD apache-arrow
Expand Down

2 changes: 1 addition & 1 deletion
dev/tasks/verify-rc/github.linux.amd64.docker.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ jobs:
 -e TEST_{{ target|upper }}=1 \
 {{ distro }}-verify-rc

 {% if arrow.branch == 'master' %}
 {% if arrow.is_default_branch() %}
 {{ macros.github_login_dockerhub()|indent }}
 - name: Push Docker Image
 shell: bash
Expand Down