File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,10 @@ if [[ ${PACKAGE_TYPE} == "libtorch" ]]; then
13
13
else
14
14
conda create -y -n ${ENV_NAME} python=${DESIRED_PYTHON} numpy pillow
15
15
conda activate ${ENV_NAME}
16
+ <<< <<< < Updated upstream
17
+ =======
18
+
19
+ >>>>>>> Stashed changes
16
20
export CONDA_LIBRARY_PATH=" $( dirname $( which python) ) /../lib"
17
21
export LD_LIBRARY_PATH=$CONDA_LIBRARY_PATH :$LD_LIBRARY_PATH
18
22
INSTALLATION=${INSTALLATION/ " conda install" / " conda install -y" }
Original file line number Diff line number Diff line change @@ -49,12 +49,12 @@ jobs:
49
49
matrix : ${{ fromJson(needs.generate-macos-matrix.outputs.matrix) }}
50
50
fail-fast : false
51
51
uses : pytorch/test-infra/.github/workflows/macos_job.yml@main
52
- name : ${{ matrix.build_name }}
52
+ name : macos
53
53
with :
54
54
runner : ${{ matrix.validation_runner }}
55
55
repository : " pytorch/builder"
56
56
ref : ${{ inputs.ref || github.ref }}
57
- job-name : ${{ matrix.build_name }}
57
+ job-name : macos
58
58
script : |
59
59
set -ex
60
60
export ENV_NAME="conda-env-${{ github.run_id }}"
@@ -75,12 +75,12 @@ jobs:
75
75
matrix : ${{ fromJson(needs.generate-macos-arm64-matrix.outputs.matrix) }}
76
76
fail-fast : false
77
77
uses : pytorch/test-infra/.github/workflows/macos_job.yml@main
78
- name : ${{ matrix.build_name }}
78
+ name : macos-arm64
79
79
with :
80
80
runner : ${{ matrix.validation_runner }}
81
81
repository : " pytorch/builder"
82
82
ref : ${{ inputs.ref || github.ref }}
83
- job-name : ${{ matrix.build_name }}
83
+ job-name : macos-arm64
84
84
script : |
85
85
set -ex
86
86
export ENV_NAME="conda-env-${{ github.run_id }}"
You can’t perform that action at this time.
0 commit comments