Skip to content

Commit

Permalink
ci: update actions/(upload|download)-artifact (#2904)
Browse files Browse the repository at this point in the history
* ci: upload separate artifacts

* ci: update docs workflow too

* ci: missing updates
  • Loading branch information
agoose77 authored Dec 19, 2023
1 parent f6d6f5c commit 1cc22e5
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 42 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Check metadata
run: pipx run twine check awkward-cpp/dist/*

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: awkward-cpp/dist/*.tar.gz

Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
)
- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: wheelhouse/*.whl

Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
)
- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: wheelhouse/*.whl

Expand All @@ -172,7 +172,7 @@ jobs:
name: "pypi"
url: "https://pypi.org/project/awkward-cpp/"
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Check metadata
run: pipx run twine check dist/*

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: distributions
path: dist/*
Expand All @@ -93,7 +93,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: header-only
path: header-only
Expand All @@ -108,7 +108,7 @@ jobs:
name: "pypi"
url: "https://pypi.org/project/awkward/"
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: distributions
path: dist
Expand All @@ -121,7 +121,7 @@ jobs:
needs: [bundle-headers]
if: github.event_name == 'release' && github.event.action == 'published'
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: header-only
path: header-only
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
working-directory: awkward-cpp

- name: Upload wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: awkward-cpp-wasm
path: awkward-cpp/dist/awkward*wasm32.whl
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
run: python -m build -w ./awkward-cpp

- name: Upload wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: awkward-cpp-x86-64
path: awkward-cpp/dist/awkward*.whl
Expand All @@ -187,7 +187,7 @@ jobs:
run: pipx run build -w

- name: Upload wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: awkward
path: dist/awkward*.whl
Expand All @@ -214,13 +214,13 @@ jobs:
destination: "/tmp/wheels/"

- name: Download awkward wheel
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: awkward
path: /tmp/wheels/

- name: Download awkward-cpp x86_64 wheel
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: awkward-cpp-x86-64
path: /tmp/wheels/
Expand All @@ -234,7 +234,7 @@ jobs:
run: jupyter nbconvert --to notebook --execute --inplace user-guide/how-to-use-in-cpp-cppyy.ipynb

- name: Save executed notebook
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: how-to-use-in-cpp-cppyy
path: docs/user-guide/how-to-use-in-cpp-cppyy.ipynb
Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:
doxygen
- name: Download awkward wheel
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: awkward
path: dist
Expand All @@ -286,13 +286,13 @@ jobs:
cp dist/awkward*.whl docs/lite/pypi/
- name: Download & copy awkward-cpp WASM wheel to JupyterLite
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: awkward-cpp-wasm
path: docs/lite/pypi

- name: Download awkward-cpp x86_64 wheel
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: awkward-cpp-x86-64
path: dist
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
echo "DOCS_VERSION=main" >> $GITHUB_ENV
- name: Download cppyy notebook
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: how-to-use-in-cpp-cppyy
path: docs/user-guide
Expand All @@ -332,19 +332,19 @@ jobs:
working-directory: docs

- name: Upload docs artefact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs
path: docs/_build/html

- name: Upload Jupyter Book cache
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: doctrees
path: docs/_build/doctrees

- name: Upload Jupyter Book cache
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jupyter-cache
path: docs/_build/.jupyter_cache
Expand Down Expand Up @@ -372,7 +372,7 @@ jobs:
aws-region: eu-west-2
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
- name: Download rendered docs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docs
path: built-docs
Expand Down Expand Up @@ -404,7 +404,7 @@ jobs:
aws-region: eu-west-2
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
- name: Download rendered docs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docs
path: built-docs
Expand Down
43 changes: 24 additions & 19 deletions .github/workflows/packaging-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ env:
SOURCE_DATE_EPOCH: "1668811211"

jobs:
make_sdists:
name: "Make SDists"
build_awkward_sdist_wheel:
name: "Build awkward"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -24,24 +24,33 @@ jobs:
- name: Prepare build files
run: pipx run nox -s prepare

- name: Build awkward SDist
run: pipx run build --sdist
- name: Build awkward SDist & wheel
run: pipx run build

- name: Check metadata
run: pipx run twine check dist/*

- name: Build awkward-cpp SDist
run: pipx run build --sdist awkward-cpp

- name: Check metadata
run: pipx run twine check dist/*
- uses: actions/upload-artifact@v4
with:
name: awkward-sdist
path: dist/*.tar.gz

- uses: actions/upload-artifact@v4
with:
name: awkward-wheel
path: dist/*.whl

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: |
dist/*.tar.gz
awkward-cpp/dist/*.tar.gz
name: awkward-cpp-sdist
path: awkward-cpp/dist/*.tar.gz


build_wheels:
name: "Make Wheel: ${{ matrix.os }}"
build_cpp_wheels:
name: "Build awkward-cpp: ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -72,12 +81,8 @@ jobs:
config-file: cibuildwheel.toml
package-dir: awkward-cpp

- name: Build awkward wheel
run: pipx run build --wheel .

- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: |
wheelhouse/*.whl
dist/*.whl
name: awkward-cpp-wheels-${{ matrix.os }}
path: wheelhouse/*.whl

0 comments on commit 1cc22e5

Please sign in to comment.