From ab936aff8624b893e7d5043066214ca4058a1e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rennfanz=2C=20Bj=C3=B6rn?= <bjoern.rennfanz@baslerweb.com>
Date: Wed, 3 Jul 2024 06:51:49 +0200
Subject: [PATCH] Update github actions to newer version. Fixed issue with
 upload of release artifacts. Fixed reference version for linux and windows
 builds, update changelog.

---
 .github/workflows/main.yml | 19 ++++++++-----------
 changelog.txt              |  5 +++++
 setup.py                   |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4ace570..cad4546 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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:
@@ -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
@@ -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/*
@@ -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"
 
@@ -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
 
@@ -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"
 
@@ -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
 
diff --git a/changelog.txt b/changelog.txt
index 2a4d311..266fb9f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -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.
diff --git a/setup.py b/setup.py
index 1d9c4af..8d2c51a 100755
--- a/setup.py
+++ b/setup.py
@@ -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"