Skip to content

Commit

Permalink
Update github actions to newer version. Fixed issue with upload of re…
Browse files Browse the repository at this point in the history
…lease artifacts. Fixed reference version for linux and windows builds, update changelog.
  • Loading branch information
bjoernrennfanz committed Jul 3, 2024
1 parent d5ae05c commit ab936af
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
19 changes: 8 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ env:
jobs:
setup:
runs-on: ubuntu-latest
outputs:
is_release_build: ${{ env.RELEASE_BUILD == '1' }}
steps:
- uses: jfrog/setup-jfrog-cli@v4
env:
Expand Down Expand Up @@ -81,14 +83,10 @@ jobs:
path: macos_sdk

- name: Check for release build
id: check_release_build
if: startsWith(github.ref, 'refs/tags/')
run: |
echo "Build release for $GITHUB_REF"
echo "release_build=1" >> $GITHUB_OUTPUT
outputs:
is_release_build: ${{ steps.check_release_build.outputs.env.release_build == '1' }}
echo "RELEASE_BUILD=1" >> $GITHUB_ENV
build-linux:
needs: setup
Expand Down Expand Up @@ -129,8 +127,7 @@ jobs:
docker run --rm --privileged multiarch/qemu-user-static:register --reset
./scripts/build/build-arch.sh --platform-tag $P --abi-tag $A --pylon-dir ./pylon-installer $ARGS
# TODO: can we use v4 here?
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-results-${{ matrix.p }}-${{ matrix.a }}
path: dist/*
Expand Down Expand Up @@ -159,7 +156,7 @@ jobs:
- uses: actions/checkout@v4

- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.9 - 3.12"

Expand All @@ -181,7 +178,7 @@ jobs:
- name: Build wheels
uses: pypa/cibuildwheel@v2.19

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./wheelhouse/*.whl

Expand Down Expand Up @@ -210,7 +207,7 @@ jobs:
- uses: actions/checkout@v4

- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.9 - 3.12"

Expand All @@ -233,7 +230,7 @@ jobs:
PYLON_FRAMEWORK_ARM64: /Library/Frameworks
PYLON_FRAMEWORK_X86_64: /Library/Frameworks

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./wheelhouse/*.whl

Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 4.0.0rc2
- Date 2024-07-03
- Fixed issue with upload of release artifacts.
- Fixed reference version for linux and windows builds

Version 4.0.0rc1
- Date 2024-07-02
- Updated to pylon 7.5 on linux and windows.
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
from pathlib import Path
# The pylon version this source tree was designed for, by platform
ReferencePylonVersion = {
"Windows": "7.4.0",
"Windows": "8.0.0",
# ATTENTION: This version is the pylon core version reported by pylon-config,
# which is not equal to the version on the outer tar.gz
"Linux": "7.4.0",
"Linux": "8.0.0",
"Linux_armv7l": "6.2.0",
"Darwin": "7.3.1",
"Darwin_arm64": "7.3.1"
Expand Down

0 comments on commit ab936af

Please sign in to comment.