Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
vision
Commits
778ce48b
Unverified
Commit
778ce48b
authored
May 28, 2024
by
Nicolas Hug
Committed by
GitHub
May 28, 2024
Browse files
Remove x86 MacOS jobs and use M1 instead (#8446)
parent
337fa343
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
18 deletions
+1
-18
.github/scripts/setup-env.sh
.github/scripts/setup-env.sh
+0
-11
.github/workflows/build-cmake.yml
.github/workflows/build-cmake.yml
+0
-1
.github/workflows/tests.yml
.github/workflows/tests.yml
+1
-6
No files found.
.github/scripts/setup-env.sh
View file @
778ce48b
...
@@ -22,17 +22,6 @@ case $(uname) in
...
@@ -22,17 +22,6 @@ case $(uname) in
;;
;;
esac
esac
if
[[
"
${
OS_TYPE
}
"
==
"macos"
&&
$(
uname
-m
)
==
x86_64
]]
;
then
echo
'::group::Uninstall system JPEG libraries on macOS'
# The x86 macOS runners, e.g. the GitHub Actions native "macos-12" runner, has some JPEG and PNG libraries
# installed by default that interfere with our build. We uninstall them here and use the one from conda below.
IMAGE_LIBS
=
$(
brew list |
grep
-E
"jpeg|png"
)
for
lib
in
$IMAGE_LIBS
;
do
brew uninstall
--ignore-dependencies
--force
"
${
lib
}
"
done
echo
'::endgroup::'
fi
echo
'::group::Create build environment'
echo
'::group::Create build environment'
# See https://github.com/pytorch/vision/issues/7296 for ffmpeg
# See https://github.com/pytorch/vision/issues/7296 for ffmpeg
conda create
\
conda create
\
...
...
.github/workflows/build-cmake.yml
View file @
778ce48b
...
@@ -40,7 +40,6 @@ jobs:
...
@@ -40,7 +40,6 @@ jobs:
strategy
:
strategy
:
matrix
:
matrix
:
include
:
include
:
-
runner
:
macos-12
-
runner
:
macos-m1-stable
-
runner
:
macos-m1-stable
fail-fast
:
false
fail-fast
:
false
uses
:
pytorch/test-infra/.github/workflows/macos_job.yml@main
uses
:
pytorch/test-infra/.github/workflows/macos_job.yml@main
...
...
.github/workflows/tests.yml
View file @
778ce48b
...
@@ -53,16 +53,11 @@ jobs:
...
@@ -53,16 +53,11 @@ jobs:
-
"
3.10"
-
"
3.10"
-
"
3.11"
-
"
3.11"
-
"
3.12"
-
"
3.12"
runner
:
[
"
macos-12"
]
runner
:
[
"
macos-m1-stable"
]
include
:
-
python-version
:
"
3.8"
runner
:
macos-m1-stable
fail-fast
:
false
fail-fast
:
false
uses
:
pytorch/test-infra/.github/workflows/macos_job.yml@main
uses
:
pytorch/test-infra/.github/workflows/macos_job.yml@main
with
:
with
:
repository
:
pytorch/vision
repository
:
pytorch/vision
# We need an increased timeout here, since the macos-12 runner is the free one from GH
# and needs roughly 2 hours to just run the test suite
timeout
:
240
timeout
:
240
runner
:
${{ matrix.runner }}
runner
:
${{ matrix.runner }}
test-infra-ref
:
main
test-infra-ref
:
main
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment