Skip to content

Commit 778ce48

Browse files
authored
Remove x86 MacOS jobs and use M1 instead (#8446)
1 parent 337fa34 commit 778ce48

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

.github/scripts/setup-env.sh

-11
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,6 @@ case $(uname) in
2222
;;
2323
esac
2424

25-
if [[ "${OS_TYPE}" == "macos" && $(uname -m) == x86_64 ]]; then
26-
echo '::group::Uninstall system JPEG libraries on macOS'
27-
# The x86 macOS runners, e.g. the GitHub Actions native "macos-12" runner, has some JPEG and PNG libraries
28-
# installed by default that interfere with our build. We uninstall them here and use the one from conda below.
29-
IMAGE_LIBS=$(brew list | grep -E "jpeg|png")
30-
for lib in $IMAGE_LIBS; do
31-
brew uninstall --ignore-dependencies --force "${lib}"
32-
done
33-
echo '::endgroup::'
34-
fi
35-
3625
echo '::group::Create build environment'
3726
# See https://github.com/pytorch/vision/issues/7296 for ffmpeg
3827
conda create \

.github/workflows/build-cmake.yml

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
strategy:
4141
matrix:
4242
include:
43-
- runner: macos-12
4443
- runner: macos-m1-stable
4544
fail-fast: false
4645
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main

.github/workflows/tests.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,11 @@ jobs:
5353
- "3.10"
5454
- "3.11"
5555
- "3.12"
56-
runner: ["macos-12"]
57-
include:
58-
- python-version: "3.8"
59-
runner: macos-m1-stable
56+
runner: ["macos-m1-stable"]
6057
fail-fast: false
6158
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
6259
with:
6360
repository: pytorch/vision
64-
# We need an increased timeout here, since the macos-12 runner is the free one from GH
65-
# and needs roughly 2 hours to just run the test suite
6661
timeout: 240
6762
runner: ${{ matrix.runner }}
6863
test-infra-ref: main

0 commit comments

Comments
 (0)