Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions .github/workflows/build_wheels_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,12 @@ jobs:
working-directory: ${{ inputs.repository }}
env:
POST_SCRIPT: ${{ inputs.post-script }}
ENV_SCRIPT: ${{ inputs.env-script }}
if: ${{ inputs.post-script != '' }}
run: |
set -euxo pipefail
source "${BUILD_ENV_FILE}"
if [[ ! -f ${POST_SCRIPT} ]]; then
echo "::error::Specified post-script file (${POST_SCRIPT}) not found, not going execute it"
exit 1
else
${CONDA_RUN} bash "${POST_SCRIPT}"
fi
${CONDA_RUN} ${ENV_SCRIPT} ${POST_SCRIPT}
Copy link
Member

Choose a reason for hiding this comment

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

Why did we remove this error check?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Post script in this case is "python packaging/wheel/relocate.py", also generally this job is for inside use, I don't see big value of keeping this check I believe if script is not found the job will fail anyways.

Copy link
Member

Choose a reason for hiding this comment

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

Let's just make sure we're consistent across all the workflows and across pre-script/post-script.

- name: Smoke Test
env:
PACKAGE_NAME: ${{ inputs.package-name }}
Expand Down
20 changes: 13 additions & 7 deletions .github/workflows/test_build_wheels_windows_with_cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,19 @@ jobs:
fail-fast: false
matrix:
include:
- repository: pytorch/audio
pre-script: packaging/ffmpeg/build.bat
env-script: packaging/vc_env_helper.bat
wheel-build-params: "--plat-name win_amd64"
post-script: ""
smoke-test-script: ""
package-name: torchaudio
- repository: pytorch/audio
pre-script: packaging/ffmpeg/build.bat
env-script: packaging/vc_env_helper.bat
wheel-build-params: "--plat-name win_amd64"
post-script: ""
smoke-test-script: ""
package-name: torchaudio
- repository: pytorch/vision
pre-script: packaging/pre_build_script.sh
env-script: packaging/windows/internal/vc_env_helper.bat
post-script: "python packaging/wheel/relocate.py"
smoke-test-script: test/smoke_test.py
package-name: torchvision
uses: ./.github/workflows/build_wheels_windows.yml
name: ${{ matrix.repository }}
with:
Expand Down