Skip to content

adjust build for upload-artifact-4 #1146

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

Merged
merged 2 commits into from
Jan 10, 2024
Merged

adjust build for upload-artifact-4 #1146

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32346c3
adjust build for upload-artifact-4
davidhewitt Jan 9, 2024
12bbf6b
only bother downloading linux artifacts in test-builds-arch
davidhewitt Jan 10, 2024
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
52 changes: 13 additions & 39 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ jobs:
rust-toolchain: stable
- uses: actions/upload-artifact@v4
with:
name: pypi_files
name: pypi_files_sdist
path: dist

build:
Expand Down Expand Up @@ -447,7 +447,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
manylinux: ${{ matrix.manylinux == 'manylinux' && 'auto' || matrix.manylinux }}
manylinux: ${{ matrix.manylinux }}
args: --release --out dist --interpreter ${{ matrix.interpreter || '3.8 3.9 3.10 3.11 3.12 pypy3.9 pypy3.10' }}
rust-toolchain: stable
docker-options: -e CI
Expand All @@ -458,7 +458,7 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: pypi_files
name: pypi_files_${{ matrix.os }}_${{ matrix.target }}_${{ matrix.interpreter || 'all' }}_${{ matrix.manylinux }}
path: dist

build-pgo:
Expand Down Expand Up @@ -553,7 +553,7 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: pypi_files_pgo
name: pypi_files_${{ matrix.os }}_${{ matrix.interpreter }}
path: dist

inspect-pypi-assets:
Expand All @@ -566,22 +566,11 @@ jobs:
- name: get dist artifacts
uses: actions/download-artifact@v4
with:
name: pypi_files
pattern: pypi_files_*
merge-multiple: true
path: dist

- name: list dist files before PGO builds
run: |
ls -lh dist/
ls -l dist/
echo "`ls dist | wc -l` files"

- name: get PGO dist artifacts (comes after "get dist artifacts" to so these files override the non-PGO builds)
uses: actions/download-artifact@v4
with:
name: pypi_files_pgo
path: dist

- name: list dist files with PGO builds
- name: list dist files
run: |
ls -lh dist/
ls -l dist/
Expand Down Expand Up @@ -618,13 +607,8 @@ jobs:
- name: get dist artifacts
uses: actions/download-artifact@v4
with:
name: pypi_files
path: dist

- name: get PGO dist artifacts (comes after "get dist artifacts" to so these files override the non-PGO builds)
uses: actions/download-artifact@v4
with:
name: pypi_files_pgo
pattern: pypi_files_linux_*
merge-multiple: true
path: dist

- uses: uraimo/[email protected]
Expand Down Expand Up @@ -676,13 +660,8 @@ jobs:
- name: get dist artifacts
uses: actions/download-artifact@v4
with:
name: pypi_files
path: dist

- name: get PGO dist artifacts (comes after "get dist artifacts" to so these files override the non-PGO builds)
uses: actions/download-artifact@v4
with:
name: pypi_files_pgo
pattern: pypi_files_*
merge-multiple: true
path: dist

- run: pip install typing-extensions
Expand Down Expand Up @@ -711,13 +690,8 @@ jobs:
- name: get dist artifacts
uses: actions/download-artifact@v4
with:
name: pypi_files
path: dist

- name: get PGO dist artifacts (comes after "get dist artifacts" to so these files override the non-PGO builds)
uses: actions/download-artifact@v4
with:
name: pypi_files_pgo
pattern: pypi_files_*
merge-multiple: true
path: dist

- run: twine check --strict dist/*
Expand Down