From 7880e222b097b05d7bc65cf361566453e08fc532 Mon Sep 17 00:00:00 2001 From: dmunozv04 <39565245+dmunozv04@users.noreply.github.com> Date: Sun, 15 Dec 2024 02:09:08 +0100 Subject: [PATCH 1/6] change python cpu variant in build --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5565ae..92662bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,6 +89,7 @@ jobs: env: PYAPP_PASS_LOCATION: "1" PYAPP_UV_ENABLED: "1" + PYAPP_DISTRIBUTION_VARIANT_CPU: "v1" HATCH_BUILD_LOCATION: dist CARGO: cargo CARGO_BUILD_TARGET: ${{ matrix.job.target }} From 658fad64ebefe007d067178bc52defe7c9c20df6 Mon Sep 17 00:00:00 2001 From: David <39565245+dmunozv04@users.noreply.github.com> Date: Sun, 15 Dec 2024 02:33:04 +0100 Subject: [PATCH 2/6] Update pyapp --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 92662bc..fe62472 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,7 +94,7 @@ jobs: CARGO: cargo CARGO_BUILD_TARGET: ${{ matrix.job.target }} PYAPP_REPO: pyapp # Use local copy of pyapp (needed for cross-compiling) - PYAPP_VERSION: v0.23.0 + PYAPP_VERSION: v0.24.0 steps: - name: Checkout From ec109e0f105c8c705968bd124528b21a24c558fe Mon Sep 17 00:00:00 2001 From: dmunozv04 <39565245+dmunozv04@users.noreply.github.com> Date: Sun, 15 Dec 2024 14:00:46 +0100 Subject: [PATCH 3/6] Fix x86_64 macOS and test aarch64-windows --- .github/workflows/release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe62472..017bc62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,20 +76,24 @@ jobs: release_suffix: aarch64-linux # Windows - target: x86_64-pc-windows-msvc - os: windows-2022 + os: windows-latest release_suffix: x86_64-windows + - target: aarch64-pc-windows-msvc + os: windows-latest + cross: true + release_suffix: aarch64-windows # macOS - target: aarch64-apple-darwin - os: macos-14 + os: macos-latest release_suffix: aarch64-osx - target: x86_64-apple-darwin - os: macos-12 + os: macos-latest + cross: true release_suffix: x86_64-osx env: PYAPP_PASS_LOCATION: "1" PYAPP_UV_ENABLED: "1" - PYAPP_DISTRIBUTION_VARIANT_CPU: "v1" HATCH_BUILD_LOCATION: dist CARGO: cargo CARGO_BUILD_TARGET: ${{ matrix.job.target }} From 73192a11716740a2a9ab108e8a5eacd208246234 Mon Sep 17 00:00:00 2001 From: dmunozv04 <39565245+dmunozv04@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:31:16 +0100 Subject: [PATCH 4/6] add v1 variant for linux amd64 builds --- .github/workflows/release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 017bc62..e634857 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,6 +70,11 @@ jobs: os: ubuntu-latest cross: true release_suffix: x86_64-linux + - target: x86_64-unknown-linux-gnu + os: ubuntu-latest + cross: true + cpu_variant: v1 + release_suffix: x86_64-linux-v1 - target: aarch64-unknown-linux-gnu os: ubuntu-latest cross: true @@ -78,10 +83,6 @@ jobs: - target: x86_64-pc-windows-msvc os: windows-latest release_suffix: x86_64-windows - - target: aarch64-pc-windows-msvc - os: windows-latest - cross: true - release_suffix: aarch64-windows # macOS - target: aarch64-apple-darwin os: macos-latest @@ -97,6 +98,7 @@ jobs: HATCH_BUILD_LOCATION: dist CARGO: cargo CARGO_BUILD_TARGET: ${{ matrix.job.target }} + PYAPP_DISTRIBUTION_VARIANT_CPU: ${{ matrix.job.cpu_variant }} PYAPP_REPO: pyapp # Use local copy of pyapp (needed for cross-compiling) PYAPP_VERSION: v0.24.0 From b3dd27748b8353f1cfae6993e177a4ee2b39571f Mon Sep 17 00:00:00 2001 From: dmunozv04 <39565245+dmunozv04@users.noreply.github.com> Date: Mon, 6 Jan 2025 18:35:01 +0100 Subject: [PATCH 5/6] better actions name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e634857..826f333 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: build-binaries: - name: Build binaries for ${{ matrix.job.target }} (${{ matrix.job.os }}) + name: Build binaries for ${{ matrix.job.release_suffix }} (${{ matrix.job.os }}) needs: - build-sdist-and-wheel runs-on: ${{ matrix.job.os }} From afaced8f847f0975d2dc18ee0fa459912ff46cc4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 17:47:30 +0000 Subject: [PATCH 6/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 826f333..53db252 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: build-binaries: - name: Build binaries for ${{ matrix.job.release_suffix }} (${{ matrix.job.os }}) + name: Build binaries for ${{ matrix.job.release_suffix }} (${{ matrix.job.os }}) needs: - build-sdist-and-wheel runs-on: ${{ matrix.job.os }}