Skip to content

Commit

Permalink
Merge pull request #290 from dpogue/py312-x64
Browse files Browse the repository at this point in the history
Add building for Python 3.12, x64 in CI
  • Loading branch information
zrax authored Sep 22, 2024
2 parents f372a43 + c41bd1b commit d1386cf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Build string_theory
run: |
mkdir -p build_deps && cd build_deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
matrix:
compiler: [gcc, clang]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Install dependencies
run: |
brew install libjpeg-turbo libpng
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ jobs:
strategy:
matrix:
platform:
- { image: windows-2022, generator: Visual Studio 17 2022, toolset: v143, cmake-arch: x64, arch: x64, python: "3.12", unity: ON, str: windows-x64-v143 }
- { image: windows-2022, generator: Visual Studio 17 2022, toolset: v143, cmake-arch: x64, arch: x64, python: "3.11", unity: ON, str: windows-x64-v143 }
- { image: windows-2022, generator: Visual Studio 17 2022, toolset: v143, cmake-arch: x64, arch: x64, python: "3.10", unity: ON, str: windows-x64-v143 }
- { image: windows-2019, generator: Visual Studio 16 2019, toolset: v142, cmake-arch: Win32, arch: x86, python: 3.9, unity: ON, str: windows-x86-v142 }
- { image: windows-2019, generator: Visual Studio 16 2019, toolset: v142, cmake-arch: x64, arch: x64, python: 3.8, unity: OFF, str: windows-x64-v142 }
Expand All @@ -20,9 +22,9 @@ jobs:

steps:
- name: Checkout HSPlasma
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Checkout vcpkg
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: microsoft/vcpkg
path: vcpkg
Expand All @@ -44,10 +46,10 @@ jobs:
id: vcpkg-rev
run: |
Set-Location vcpkg
Write-Host "::set-output name=ref::$(git rev-parse HEAD)"
"ref=$(git rev-parse HEAD)" >> $env:GITHUB_OUTPUT
- name: Restore Dependency Libraries
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: build/vcpkg_installed
key: vcpkg-${{ matrix.platform.str }} ${{ steps.vcpkg-rev.outputs.ref }} ${{ hashFiles('vcpkg.json') }}
Expand All @@ -56,7 +58,7 @@ jobs:
vcpkg-${{ matrix.platform.str }}
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.platform.python }}
architecture: ${{ matrix.platform.arch }}
Expand Down Expand Up @@ -88,7 +90,7 @@ jobs:
python -c "import PyHSPlasma; print(dir(PyHSPlasma))"
- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: libhsplasma-${{ matrix.platform.str }}-py${{ matrix.platform.python }}
path: build/install

0 comments on commit d1386cf

Please sign in to comment.