Skip to content
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

ARROW-17175: [CI][macOS] macos-10.15 is deprecated and macos-latest is macos-11 #13684

Merged
merged 10 commits into from
Aug 16, 2022
Merged

ARROW-17175: [CI][macOS] macos-10.15 is deprecated and macos-latest is macos-11 #13684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a006860
ARROW-17175: [CI][macOS] macos-10.15 is deprecated and macos-latest i…
kou Jul 22, 2022
cbc1b31
Use macOS
kou Jul 28, 2022
f4e3524
Use macos-11 explicitly to not use self-hosted macos-latest
kou Jul 29, 2022
b0ae309
Use macos-12 explicitly to not use self-hosted macos-latest
kou Jul 29, 2022
254275c
Use the latest gcs-testbench to use crc32c 2.3
kou Aug 5, 2022
78176ab
Use macOS-latest
kou Aug 5, 2022
224deb2
Use macos-latest
kou Aug 6, 2022
05c717d
Revert changes for dev/tasks/r/
kou Aug 6, 2022
5b914e8
Don't use macos-10.15
kou Aug 8, 2022
90af5f1
Fix a typo
kou Aug 8, 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
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
docker-compose run --rm minimal

macos:
name: AMD64 MacOS 10.15 C++
name: AMD64 macOS 11 C++
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 60
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/csharp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
run: ci/scripts/csharp_test.sh $(pwd)

macos:
name: AMD64 MacOS 10.15 C# ${{ matrix.dotnet }}
name: AMD64 macOS 11 C# ${{ matrix.dotnet }}
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 15
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
run: ci/scripts/go_test.sh $(pwd)

macos:
name: AMD64 MacOS 10.15 Go ${{ matrix.go }}
name: AMD64 macOS 11 Go ${{ matrix.go }}
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 15
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
run: ci/scripts/go_test.sh $(pwd)

macos-cgo:
name: AMD64 MacOS 10.15 Go ${{ matrix.go }} - CGO
name: AMD64 macOS 11 Go ${{ matrix.go }} - CGO
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 60
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
run: archery docker push ${{ matrix.image }}

macos:
name: AMD64 MacOS 10.15 Java JDK ${{ matrix.jdk }}
name: AMD64 macOS 11 Java JDK ${{ matrix.jdk }}
runs-on: macos-latest
if: github.event_name == 'push'
timeout-minutes: 30
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
run: archery docker push debian-js

macos:
name: AMD64 MacOS 10.15 NodeJS ${{ matrix.node }}
name: AMD64 macOS 11 NodeJS ${{ matrix.node }}
runs-on: macos-latest
if: github.event_name == 'push'
timeout-minutes: 60
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/matlab.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ jobs:
with:
select-by-folder: matlab/test
macos:
name: AMD64 MacOS 10.15 MATLAB
name: AMD64 macOS 11 MATLAB
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
steps:
- name: Check out repository
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
run: archery docker push ${{ matrix.image }}

macos:
name: AMD64 MacOS 10.15 Python 3
name: AMD64 macOS 11 Python 3
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 60
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
run: archery docker push ubuntu-ruby

macos:
name: AMD64 MacOS 10.15 GLib & Ruby
name: AMD64 macOS 11 GLib & Ruby
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 60
Expand Down
8 changes: 4 additions & 4 deletions ci/scripts/install_gcs_testbench.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ case "$(uname -s)-$(uname -m)" in
Darwin-arm64)
# Workaround for https://github.com/grpc/grpc/issues/28387 .
# Build grpcio instead of using wheel.
# storage-testbench 0.16.0 pins grpcio to 1.44.0.
${PYTHON:-python3} -m pip install --no-binary :all: "grpcio==1.44.0"
# storage-testbench 0.27.0 pins grpcio to 1.46.1.
${PYTHON:-python3} -m pip install --no-binary :all: "grpcio==1.46.1"
;;
*_NT-*)
# Mingw-w64: MSYS_NT-10.0-19043, MINGW32_NT-10.0-19043, MINGW64_NT-10.0-19043
# Don't use the "/MT" option because g++ doesn't recognize it.
# "/MT" is for Visual Studio.
GRPC_PYTHON_CFLAGS=" " ${PYTHON:-python3} -m pip install "grpcio==1.44.0"
GRPC_PYTHON_CFLAGS=" " ${PYTHON:-python3} -m pip install "grpcio==1.46.1"
;;
esac

version=$1
if [[ "${version}" -eq "default" ]]; then
version="v0.16.0"
version="v0.27.0"
fi

${PYTHON:-python3} -m pip install \
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/conda-recipes/azure.osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
jobs:
- job: osx
pool:
vmImage: macOS-10.15
vmImage: macOS-latest
timeoutInMinutes: 360
variables:
CONFIG: {{ config }}
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/homebrew-formulae/github.macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
jobs:
homebrew:
name: "Homebrew"
runs-on: macOS-latest
runs-on: macos-latest
steps:
{{ macros.github_checkout_arrow()|indent }}

Expand Down
12 changes: 6 additions & 6 deletions dev/tasks/python-wheels/github.osx.amd64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ env:

jobs:
build:
name: Build wheel for OS X
runs-on: macos-10.15
name: Build wheel for macOS
runs-on: macos-latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not macos-11 explicitly?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because I don't think that we need exactly macos-11 for this. We specify MACOSX_DEPLOYMENT_TARGET explicitly for this job. So I think that we can generate logically same binaries regardless of macOS version.
If this doesn't depend on exactly macos-11 and we use macos-latest here, we don't need to update this again when macos-11 is deprecated.

Should we use macos-11 explicitly here? If so, why do we need exactly macos-11 here?

env:
VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
steps:
Expand Down Expand Up @@ -65,21 +65,21 @@ jobs:

- name: Setup NuGet Credentials
shell: bash
env:
env:
GITHUB_TOKEN: {{ '${{ secrets.GITHUB_TOKEN }}' }}
run: |
run: |
mono `vcpkg fetch nuget | tail -n 1` \
sources add \
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
-storepasswordincleartext \
-name "GitHub" \
-username "$GITHUB_REPOSITORY_OWNER" \
-password "$GITHUB_TOKEN" \

mono `vcpkg fetch nuget | tail -n 1` \
setapikey "$GITHUB_TOKEN" \
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"

- name: Install Packages
run: |
if [ "${ARROW_S3}" == "ON" ]; then
Expand Down
6 changes: 3 additions & 3 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ tasks:
params:
target: {{ target }}
use_conda: True
github_runner: "macos-10.15"
github_runner: "macos-latest"
{% endfor %}

{% for target in ["cpp",
Expand All @@ -1041,7 +1041,7 @@ tasks:
template: verify-rc/github.macos.amd64.yml
params:
target: {{ target }}
github_runner: "macos-10.15"
github_runner: "macos-latest"
{% endfor %}

{% for target in ["cpp",
Expand All @@ -1065,7 +1065,7 @@ tasks:
github_runner: ["self-hosted", "macOS", "arm64"]
{% endfor %}

{% for macos_version in ["10.15", "11"] %}
{% for macos_version in ["11", "12"] %}
verify-rc-binaries-wheels-macos-{{ macos_version }}-amd64:
ci: github
template: verify-rc/github.macos.amd64.yml
Expand Down