Skip to content

Commit

Permalink
Merge branch 'master' into ARROW-13398_install.Rmd
Browse files Browse the repository at this point in the history
  • Loading branch information
thisisnic committed Nov 22, 2021
2 parents 6850eb4 + 911a833 commit c0f8fde
Show file tree
Hide file tree
Showing 871 changed files with 33,245 additions and 14,448 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/archery.yml
Expand Up @@ -32,7 +32,7 @@ on:
- 'docker-compose.yml'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cpp.yml
Expand Up @@ -38,7 +38,7 @@ on:
- 'format/Flight.proto'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand All @@ -53,7 +53,7 @@ jobs:
name: ${{ matrix.title }}
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 45
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/csharp.yml
Expand Up @@ -30,7 +30,7 @@ on:
- 'csharp/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Expand Up @@ -23,7 +23,7 @@ on:
pull_request:

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/go.yml
Expand Up @@ -33,7 +33,7 @@ on:
- 'go/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down Expand Up @@ -238,13 +238,12 @@ jobs:
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
go: [1.15]
matrix:
mingw-n-bits:
#- 32 runtime handling for CGO needs 64-bit currently
- 64
env:
ARROW_GO_TESTCGO: "1"
ARROW_GO_TESTCGO: "1"
steps:
- name: Disable Crash Dialogs
run: |
Expand All @@ -254,10 +253,6 @@ jobs:
/t REG_DWORD `
/d 1 `
/f
- name: Install go
uses: actions/setup-go@v1
with:
go-version: ${{ matrix.go }}
- name: Checkout Arrow
uses: actions/checkout@v2
with:
Expand All @@ -278,7 +273,10 @@ jobs:
run: |
echo "CGO_CPPFLAGS=-I$(cygpath --windows ${MINGW_PREFIX}/include)" >> $GITHUB_ENV
echo "CGO_LDFLAGS=-g -O2 -L$(cygpath --windows ${MINGW_PREFIX}/lib) -L$(cygpath --windows ${MINGW_PREFIX}/bin)" >> $GITHUB_ENV
echo "$(cygpath --windows ${MINGW_PREFIX}/bin)" >> $GITHUB_PATH
echo "GOROOT=$(cygpath --windows ${MINGW_PREFIX}/lib/go)" >> $GITHUB_ENV
echo "GOPATH=$(cygpath --windows ${HOME}/gopath)" >> $GITHUB_ENV
mkdir -p $(cygpath --windows ${HOME}/gopath)
echo "MINGW_PREFIX=$(cygpath --windows ${MINGW_PREFIX})" >> $GITHUB_ENV
- name: Build
shell: bash
run: ci/scripts/go_build.sh .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Expand Up @@ -42,7 +42,7 @@ on:
- 'format/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
Expand Up @@ -36,7 +36,7 @@ on:
- 'java/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down
35 changes: 34 additions & 1 deletion .github/workflows/java_jni.yml
Expand Up @@ -36,7 +36,7 @@ on:
- 'java/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down Expand Up @@ -78,3 +78,36 @@ jobs:
if: success() && github.event_name == 'push' && github.repository == 'apache/arrow'
continue-on-error: true
run: archery docker push debian-java-jni

docker_integration_python:
name: AMD64 Debian 9 Java C Data Interface Integration
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 90
steps:
- name: Checkout Arrow
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Fetch Submodules and Tags
run: ci/scripts/util_checkout.sh
- name: Free Up Disk Space
run: ci/scripts/util_cleanup.sh
- name: Cache Docker Volumes
uses: actions/cache@v2
with:
path: .docker
key: maven-${{ hashFiles('java/**') }}
restore-keys: maven-
- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: 3.8
- name: Setup Archery
run: pip install -e dev/archery[docker]
- name: Execute Docker Build
run: archery docker run conda-python-java-integration
- name: Docker Push
if: success() && github.event_name == 'push' && github.repository == 'apache/arrow'
continue-on-error: true
run: archery docker push conda-python-java-integration
2 changes: 1 addition & 1 deletion .github/workflows/js.yml
Expand Up @@ -32,7 +32,7 @@ on:
- 'js/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/julia.yml
Expand Up @@ -27,7 +27,7 @@ on:
- 'julia/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/matlab.yml
Expand Up @@ -32,13 +32,13 @@ on:
- 'cpp/src/arrow/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

jobs:

matlab:
name: AMD64 Ubuntu 20.04 MATLAB
name: AMD64 Ubuntu 20.04 MATLAB
runs-on: ubuntu-latest
steps:
- name: Check out repository
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Build MATLAB Interface
run: ci/scripts/matlab_build.sh $(pwd)
- name: Run MATLAB Tests
env:
env:
# libarrow.so requires a more recent version of libstdc++.so
# than is bundled with MATLAB under <matlabroot>/sys/os/glnxa64.
# Therefore, if a MEX function that depends on libarrow.so
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Expand Up @@ -32,7 +32,7 @@ on:
- 'python/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r-without-arrow.yml
Expand Up @@ -28,7 +28,7 @@ on:
- "r/src/**"

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r.yml
Expand Up @@ -40,7 +40,7 @@ on:
- "r/**"

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Expand Up @@ -44,7 +44,7 @@ on:
- 'ruby/**'

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

env:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -47,6 +47,8 @@ perf.data.old
cpp/.idea/
.clangd/
cpp/.clangd/
.cache/clangd/
cpp/.cache/clangd/
cpp/apidoc/xml/
docs/example.gz
docs/example1.dat
Expand Down

0 comments on commit c0f8fde

Please sign in to comment.