Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove double doc upload after path unification #4135

Merged
merged 3 commits into from
May 10, 2023
Merged

remove double doc upload after path unification #4135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bdf4c7
remove double doc upload after path unification
pmeier May 8, 2023
99af4e7
fix test
pmeier May 8, 2023
aaf414b
revert s3-prefix
pmeier May 8, 2023
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
12 changes: 1 addition & 11 deletions .github/workflows/linux_job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,6 @@ jobs:
path: ${{ runner.temp }}/artifacts/
if-no-files-found: ${{ steps.check-artifacts.outputs.if-no-files-found }}

# TODO: Remove once we converge on documentation paths
- name: (legacy) Upload documentation to S3 (if any)
uses: seemethere/upload-artifact-s3@v5
if: ${{ steps.check-artifacts.outputs.upload-docs == 1 && github.event.pull_request.number != '' }}
with:
retention-days: 14
s3-bucket: doc-previews
if-no-files-found: error
path: ${{ env.RUNNER_DOCS_DIR }}
s3-prefix: pytorch/${{ env.REPOSITORY }}/${{ github.event.pull_request.number }}

- name: Upload documentation to S3 (if any)
uses: seemethere/upload-artifact-s3@v5
if: ${{ steps.check-artifacts.outputs.upload-docs == 1 && github.event.pull_request.number != '' }}
Expand All @@ -233,6 +222,7 @@ jobs:
s3-bucket: doc-previews
if-no-files-found: error
path: ${{ env.RUNNER_DOCS_DIR }}
# ${{ env.repository }} is $OWNER/$REPO
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I was wrong above. Since this contains the owner and repo, the legacy label was correctly attached.

s3-prefix: ${{ env.REPOSITORY }}/${{ github.event.pull_request.number }}

- name: Teardown Linux
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test_linux_job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,8 @@ jobs:
script: |
# Sleep a couple of seconds just in case S3 is being slow (might not be needed?)
sleep 10
# TODO: Change this eventually to reflect new url path, see https://github.com/pytorch/test-infra/issues/3894
REPO_NAME="$(echo "${GITHUB_REPOSITORY}" | cut -d '/' -f2)"
curl -fsSL "https://docs-preview.pytorch.org/${REPO_NAME}/${PR_NUMBER}/index.html" | grep "hello"
curl -fsSL "https://docs-preview.pytorch.org/pytorch/${REPO_NAME}/${PR_NUMBER}/index.html" | grep "hello"
test-with-matrix:
uses: ./.github/workflows/linux_job.yml
strategy:
Expand Down