Skip to content

Commit

Permalink
Correctly reland commit 0d1cc21
Browse files Browse the repository at this point in the history
  • Loading branch information
mara004 committed Feb 8, 2024
1 parent 34b356b commit b0352a1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/conda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
fetch-depth: 0

- name: Miniconda setup
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ inputs.py_version }}
Expand All @@ -66,7 +66,7 @@ jobs:
run: ./run craft --pdfium-ver "${{ inputs.pdfium_ver }}" conda_${{ inputs.package }}

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: conda_package
path: conda/${{ inputs.package }}/out/
Expand All @@ -92,13 +92,13 @@ jobs:
repository: ${{ github.repository }}

- name: Miniconda setup
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ matrix.py }}

- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: conda_package
path: conda_dist/
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:

# FIXME custom channels probably not necessary here
- name: Miniconda setup
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ matrix.py }}
Expand All @@ -145,7 +145,7 @@ jobs:
run: conda install -y anaconda-client

- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: conda_package
path: conda_dist/
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ jobs:
run: ./run packaging_pypi

- name: Upload release notes
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release_notes
path: RELEASE.md

- name: Upload packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: packages
path: dist/*
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
ref: autorelease_tmp

- name: Download packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: packages
path: dist/
Expand Down Expand Up @@ -178,13 +178,13 @@ jobs:
python-version: ${{ inputs.py_version }}

- name: Download packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: packages
path: dist/

- name: Download release notes
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: release_notes

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ pypdfium2 includes helpers to simplify common use cases, while the raw PDFium/ct
+ To set up channels in a GH workflow
```yaml
- name: ...
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
# ... your options
channels: pypdfium2-team,bblanchon
Expand Down

0 comments on commit b0352a1

Please sign in to comment.