Skip to content

Commit

Permalink
Merge branch 'main' into universalmind303/readme-datasources
Browse files Browse the repository at this point in the history
  • Loading branch information
universalmind303 authored Jan 11, 2024
2 parents 89b1f01 + 2426bdb commit 70212e5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nodejs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
if: ${{ !matrix.settings.docker }}
shell: bash
- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: bindings-${{ matrix.settings.target }}
path: bindings/nodejs/${{ env.APP_NAME }}.*.node
Expand All @@ -144,7 +144,7 @@ jobs:
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Download all artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
path: bindings/nodejs/artifacts
- name: Move artifacts
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/python-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:
permissions:
contents: read
env:
PYTHON_VERSION: '3.7'
MATURIN_VERSION: '1.0.1'
PYTHON_VERSION: "3.7"
MATURIN_VERSION: "1.0.1"
MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
MATURIN_USERNAME: 'seanglaredb'
MATURIN_USERNAME: "seanglaredb"
PROTOC: "${{ github.workspace }}/deps/protoc/bin/protoc"
jobs:
linux:
Expand All @@ -35,10 +35,10 @@ jobs:
manylinux: "auto"
docker-options: "--env PROTOC=${{ env.PROTOC }}"
target: ${{ matrix.target }}
args: --release --out dist -m bindings/python/Cargo.toml
sccache: 'true'
args: --release --out dist -m bindings/python/Cargo.toml
sccache: "true"
- name: Upload wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist
Expand Down Expand Up @@ -66,10 +66,10 @@ jobs:
target: ${{ matrix.target }}
args: --release --out dist
working-directory: bindings/python
sccache: 'true'
container: 'off'
sccache: "true"
container: "off"
- name: Upload wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: wheels
path: bindings/python/dist
Expand All @@ -94,10 +94,10 @@ jobs:
target: ${{ matrix.target }}
args: --release --out dist
working-directory: bindings/python
sccache: 'true'
container: 'off'
sccache: "true"
container: "off"
- name: Upload wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: wheels
path: bindings/python/dist
Expand All @@ -107,7 +107,7 @@ jobs:
runs-on: ubuntu-latest
needs: [linux, macos, windows]
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: wheels
- name: Publish to PyPI
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: just dist

- name: Upload artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: dist-${{ matrix.target }}
path: ./target/dist/
Expand All @@ -55,27 +55,27 @@ jobs:
runs-on: ubuntu-latest
needs: ["dist"]
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: dist-aarch64-apple-darwin
path: dist
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: dist-x86_64-apple-darwin
path: dist
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: dist-x86_64-unknown-linux-gnu
path: dist
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: dist-x86_64-pc-windows-msvc
name: dist-x86_64-pc-windows-msvc
path: dist

- run: ls -al ./dist

- name: Upload artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: releases
path: ./dist

0 comments on commit 70212e5

Please sign in to comment.