diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 3a27427..cd566e0 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -12,14 +12,8 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: jungwinter/split@master - id: split - with: - msg: ${{ github.ref_name }} - separator: "." - - - name: Set environment - run: echo "VERSION=$(echo "${GITHUB_REF_NAME#v}" | sed 's/-LTS//g')" >> $GITHUB_ENV && echo "MINOR_VERSION=${{ steps.split.outputs._0 }}.${{ steps.split.outputs._1 }}" >> $GITHUB_ENV + - name: Set MINOR_VERSION + run: export SHORT=${GITHUB_REF_NAME%.*} && echo "MINOR_VERSION=${SHORT#v}" >> $GITHUB_ENV - uses: ncipollo/release-action@v1 with: diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt index a21e422..8afd2ed 100644 --- a/Code/CMakeLists.txt +++ b/Code/CMakeLists.txt @@ -3,7 +3,7 @@ # https://www.popcornfx.com/terms-and-conditions/ #---------------------------------------------------------------------------- -set(POPCORNFX_VERSION 2.19.3) +set(POPCORNFX_VERSION 2.19.4) set(POPCORNFX_LICENSE O3DE) o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_name}") diff --git a/Code/Platform/Linux/PAL_linux.cmake b/Code/Platform/Linux/PAL_linux.cmake index 5f1a379..af2afac 100644 --- a/Code/Platform/Linux/PAL_linux.cmake +++ b/Code/Platform/Linux/PAL_linux.cmake @@ -6,12 +6,12 @@ set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages") if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux) - set(pk_package_hash 1f47c4d73869879eb1b3fab5f40c045fd03966598d24229670aa73dcc87226cb) - set(pk_package_id XtsWhsRZp2a9JOR1) + set(pk_package_hash 4ce4458b87a26160f8258f122d51db9461f0604eb6fedd4b82bb02b9c3c7c622) + set(pk_package_id nLwB7xbHGaxRd7VG) elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-linux-aarch64) - set(pk_package_hash 1f47c4d73869879eb1b3fab5f40c045fd03966598d24229670aa73dcc87226cb_ARM64) - set(pk_package_id XtsWhsRZp2a9JOR1_ARM64) + set(pk_package_hash 4ce4458b87a26160f8258f122d51db9461f0604eb6fedd4b82bb02b9c3c7c622_ARM64) + set(pk_package_id nLwB7xbHGaxRd7VG_ARM64) else() message(FATAL_ERROR "Unsupported linux architecture ${CMAKE_SYSTEM_PROCESSOR}") endif() diff --git a/Code/Platform/Mac/PAL_mac.cmake b/Code/Platform/Mac/PAL_mac.cmake index b76d79e..d34948f 100644 --- a/Code/Platform/Mac/PAL_mac.cmake +++ b/Code/Platform/Mac/PAL_mac.cmake @@ -5,8 +5,8 @@ set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-mac) -set(pk_package_hash 2d147492abe0a605fd606dfcb818e48d29d9122e3ddfc13c956982ca354ef2b9) -set(pk_package_id Apq1IffPjamKVZEI) +set(pk_package_hash b69cd50f3c09e9314b1c5496545bc02a23209c1821b4295bb1b1ffa697ad9e0d) +set(pk_package_id wZAWgctxa7xK3lz6) ly_associate_package(PACKAGE_NAME ${package_name} TARGETS PopcornFX PACKAGE_HASH ${pk_package_hash}) pk_download_package_ifn(${package_name} ${pk_package_id}) diff --git a/Code/Platform/Windows/PAL_windows.cmake b/Code/Platform/Windows/PAL_windows.cmake index d5627f9..9aefb71 100644 --- a/Code/Platform/Windows/PAL_windows.cmake +++ b/Code/Platform/Windows/PAL_windows.cmake @@ -5,8 +5,8 @@ set(LY_PACKAGE_SERVER_URLS ${LY_PACKAGE_SERVER_URLS} "https://downloads.popcornfx.com/o3de-packages") set(package_name PopcornFX-${POPCORNFX_VERSION}-${POPCORNFX_LICENSE}-windows) -set(pk_package_hash 30de26850e61923b1e1afdad4237f623827649a282855e3156b09ad5b9644838) -set(pk_package_id KAVn6cM2M9Rmy9Jp) +set(pk_package_hash dff48baa6e92a3892d44f5a2c4d98a8357cea488abc4f0907ef0b50a047bd6ce) +set(pk_package_id 4ZytnOdOARvKZJFR) ly_associate_package(PACKAGE_NAME ${package_name} TARGETS PopcornFX PACKAGE_HASH ${pk_package_hash}) pk_download_package_ifn(${package_name} ${pk_package_id}) diff --git a/README.md b/README.md index 60f3134..826eda9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # O3DE PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **O3DE** as a Gem. -* **Version:** `v2.19.3` +* **Version:** `v2.19.4` * **O3DE:** `23.05`, `23.10` * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android` diff --git a/gem.json b/gem.json index 48c944f..4ca4c33 100644 --- a/gem.json +++ b/gem.json @@ -1,13 +1,13 @@ { "gem_name": "PopcornFX", - "display_name": "PopcornFX 2.19.3", + "display_name": "PopcornFX 2.19.4", "license": "Community", "license_url": "https://www.popcornfx.com/popcornfx-community-license", "origin": "Persistant Studios - popcornfx.com", "repo_uri": "https://downloads.popcornfx.com/o3de-repo", - "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.19/O3DE_PopcornFXGem_v2.19.3_Win64_Linux64_LinuxARM64_Mac64.zip", - "version": "2.19.3", - "last_updated": "2024-05-16", + "origin_uri": "https://downloads.popcornfx.com/o3de-repo/PopcornFX-2.19/O3DE_PopcornFXGem_v2.19.4_Win64_Linux64_LinuxARM64_Mac64.zip", + "version": "2.19.4", + "last_updated": "2024-06-06", "type": "Code", "summary": "The PopcornFX Gem provides real-time FX solution for particle effects.", "canonical_tags": [