Skip to content

Commit

Permalink
Update CI to use modern Python build/install
Browse files Browse the repository at this point in the history
  • Loading branch information
swt2c committed Sep 13, 2023
1 parent 5762391 commit 3d24152
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install dependencies
run: sudo apt-get install libcurl4-openssl-dev libhidapi-dev libzip-dev
run: |
sudo apt-get install libcurl4-openssl-dev libhidapi-dev libzip-dev
pip install build
- name: Build libconcord
run: |
cd libconcord
Expand All @@ -19,7 +21,8 @@ jobs:
- name: Build libconcord Python bindings
run: |
cd libconcord/bindings/python
sudo python3 setup.py install
python3 -m build
pip install dist/*.whl
python3 -c 'import libconcord; print(libconcord)'
cd -
- name: Build concordance
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ jobs:
build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install dependencies
run: brew install autoconf automake hidapi libzip
run: |
brew install autoconf automake hidapi libzip
pip3 install build
- name: Build libconcord
run: |
cd libconcord
Expand All @@ -18,7 +20,8 @@ jobs:
- name: Build libconcord Python bindings
run: |
cd libconcord/bindings/python
sudo python3 setup.py install
python3 -m build
pip3 install dist/*.whl
python3 -c 'import libconcord; print(libconcord)'
cd -
- name: Build concordance
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
container: fedora:latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install dependencies
run: dnf install -y autoconf automake diffutils libtool mingw32-curl mingw32-gcc-c++ mingw32-hidapi mingw32-libzip mingw32-nsis python3-pip python3-wheel
- name: Build libconcord
Expand All @@ -28,15 +28,15 @@ jobs:
run: |
pip install mingw-ldd
MINGW_SYSROOT_BIN="/usr/i686-w64-mingw32/sys-root/mingw/bin" concordance/win/make_installer.py
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: windows-installer
path: concordance/win/concordance-installer.exe
test:
needs: build
runs-on: windows-latest
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
id: download
with:
name: windows-installer
Expand Down

0 comments on commit 3d24152

Please sign in to comment.