Skip to content

Commit 1989a9f

Browse files
committed
Address comments
1 parent a29faf5 commit 1989a9f

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/build-wheels-windows.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ jobs:
4646
post-script: ${{ matrix.post-script }}
4747
package-name: ${{ matrix.package-name }}
4848
smoke-test-script: ${{ matrix.smoke-test-script }}
49-
trigger-event: ${{ github.event_name }}
49+
# Using "development" as trigger event so these binaries are not uploaded
50+
# to official channels yet
51+
trigger-event: development
5052
secrets:
5153
AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID: ${{ secrets.AWS_PYTORCH_UPLOADER_ACCESS_KEY_ID }}
5254
AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY: ${{ secrets.AWS_PYTORCH_UPLOADER_SECRET_ACCESS_KEY }}

packaging/pre_build_script.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
#!/bin/bash
2-
if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
3-
# Uninstall Conflicting jpeg brew formulae
2+
if [[ "$(uname)" == Darwin ]]; then
3+
# Uninstall Conflicting jpeg brew formulae
44
jpeg_packages=$(brew list | grep jpeg)
55
echo "Existing Jpeg-related Brew libraries"
66
echo $jpeg_packages
77
for pkg in $jpeg_packages; do
88
brew uninstall --ignore-dependencies --force $pkg || true
99
done
1010

11+
conda install -yq wget
12+
fi
13+
14+
if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
1115
# Install libpng from Anaconda (defaults)
1216
conda install ${CONDA_CHANNEL_FLAGS} libpng "jpeg<=9b" -y
1317
conda install -yq ffmpeg=4.2 -c pytorch
14-
conda install -yq wget
1518
else
1619
# Install native CentOS libJPEG, freetype and GnuTLS
1720
yum install -y libjpeg-turbo-devel freetype gnutls

0 commit comments

Comments
 (0)