Skip to content

Commit

Permalink
chore: modify pyapp version (#410)
Browse files Browse the repository at this point in the history
* chore: modify pyapp version

* feat: enable cross compile

* fix: correct name

* fix: testing

* feat: uncomment version

* fix: enabled cross compile

---------

Signed-off-by: Cody Fincher <204685+cofin@users.noreply.github.com>
  • Loading branch information
cofin authored Apr 29, 2024
1 parent 34990ed commit a51d54e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 25 deletions.
36 changes: 16 additions & 20 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ jobs:
# Linux
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest
cross: false
# - target: x86_64-unknown-linux-musl
# os: ubuntu-latest
# cross: false
# - target: aarch64-unknown-linux-gnu
# os: ubuntu-latest
# cross: false
# - target: i686-unknown-linux-gnu
# os: ubuntu-latest
# cross: false
cross: true
- target: x86_64-unknown-linux-musl
os: ubuntu-latest
cross: true
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest
cross: true
- target: i686-unknown-linux-gnu
os: ubuntu-latest
cross: true
# Windows
- target: x86_64-pc-windows-msvc
os: windows-2022
Expand All @@ -105,7 +105,7 @@ jobs:
CARGO: cargo
CARGO_BUILD_TARGET: ${{ matrix.job.target }}
PYAPP_REPO: pyapp
PYAPP_VERSION: v0.18.0
PYAPP_VERSION: v0.19.0
PYAPP_PROJECT_FEATURES: oracle,postgres,mssql,mysql,server,remote
PYAPP_DISTRIBUTION_EMBED: "1"
PYAPP_UV_ENABLED: "1"
Expand All @@ -119,7 +119,7 @@ jobs:

- name: Install musl-tools on Linux
run: sudo apt-get install --yes musl musl-dev musl-tools
if: ${{ matrix.job.os == 'Linux' }}
if: ${{ matrix.job.os == 'ubuntu-latest' }}

- name: Clone PyApp
run: git clone --depth 1 --branch $PYAPP_VERSION https://github.com/ofek/pyapp $PYAPP_REPO
Expand All @@ -138,15 +138,11 @@ jobs:
with:
targets: ${{ matrix.job.target }}

- name: Set up cross compiling
- name: Set up cross compiling tools
if: matrix.job.cross
uses: taiki-e/install-action@v2
uses: taiki-e/setup-cross-toolchain-action@v1
with:
tool: cross

- name: Configure cross compiling
if: matrix.job.cross
run: echo "CARGO=cross" >> $GITHUB_ENV
target: ${{ matrix.job.target}}

- name: Show toolchain information
run: |-
Expand All @@ -168,7 +164,7 @@ jobs:
working-directory: ${{ github.workspace }}
run: |-
current_version=$(hatch version)
PYAPP_PROJECT_PATH="${{ github.workspace }}/dist/dma-${current_version}-py3-none-any.whl" PYAPP_PROJECT_FEATURES="oracle,postgres,mssql,mysql,server,remote" PYAPP_DISTRIBUTION_EMBED="1" hatch -v build -t app
PYAPP_UV_ENABLED="1" PYAPP_PROJECT_PATH="${{ github.workspace }}/dist/dma-${current_version}-py3-none-any.whl" PYAPP_PROJECT_FEATURES="oracle,postgres,mssql,mysql,server,remote" PYAPP_DISTRIBUTION_EMBED="1" hatch -v build -t app
- name: Upload built binary package
uses: actions/upload-artifact@v4
Expand Down
5 changes: 0 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,6 @@ sources = ["src"]
[tool.hatch.build.targets.sdist]
exclude = ["/.github", "/docs"]

[tool.hatch.build.targets.binary]
pyapp-version = "0.18.0"
python = "3.12"


#####################
# Environment Setup #
#####################
Expand Down

0 comments on commit a51d54e

Please sign in to comment.