Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/cpp_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ permissions:

jobs:
check-labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/check_labels.yml
with:
parent-workflow: cpp_extra
Expand All @@ -80,6 +79,7 @@ jobs:
steps:
- id: set_enabled
if: >-
github.ref_type == 'tag' ||
(github.event_name == 'schedule' && github.repository == 'apache/arrow') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: C++')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cuda_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ permissions:

jobs:
check-labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/check_labels.yml
with:
parent-workflow: cuda_extra
Expand All @@ -63,6 +62,7 @@ jobs:
steps:
- id: set_enabled
if: >-
github.ref_type == 'tag' ||
(github.event_name == 'schedule' && github.repository == 'apache/arrow') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: CUDA')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ permissions:

jobs:
check-labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/check_labels.yml
with:
parent-workflow: package_linux
Expand All @@ -72,6 +71,7 @@ jobs:
steps:
- id: set_enabled
if: >-
github.ref_type == 'tag' ||
(github.event_name == 'schedule' && github.repository == 'apache/arrow') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: Package: Linux')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ permissions:

jobs:
check-labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/check_labels.yml
with:
parent-workflow: r_extra
Expand All @@ -75,6 +74,7 @@ jobs:
steps:
- id: set_enabled
if: >-
github.ref_type == 'tag' ||
(github.event_name == 'schedule' && github.repository == 'apache/arrow') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: R')
Expand Down
3 changes: 2 additions & 1 deletion ci/scripts/r_install_system_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ fi
# Install curl, OpenSSL, and libuv
# - curl/OpenSSL: technically only needed for S3/GCS support, but
# installing the R curl package fails without it
# - libpng: required by the png R package
# - libuv: required by the fs R package (no longer bundles libuv by default)
case "$PACKAGE_MANAGER" in
apt-get)
apt-get install -y libcurl4-openssl-dev libssl-dev libuv1-dev
apt-get install -y libcurl4-openssl-dev libpng-dev libssl-dev libuv1-dev
;;
apk)
$PACKAGE_MANAGER add curl-dev openssl-dev libuv-dev
Expand Down
Loading
Loading