From 38ac0cfc1c8d93456468334b9356225f2d5a5a1d Mon Sep 17 00:00:00 2001 From: nutti Date: Mon, 19 May 2025 17:20:17 +0530 Subject: [PATCH 01/12] Support Unreal Engine 5.6 --- .github/workflows/release.yaml | 2 +- AdvancedControlFlow/AdvancedControlFlow.uplugin | 2 +- README.md | 2 +- tools/remove_code.sh | 2 +- tools/replace_engine_version.sh | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 608e72d..1dd7c16 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,7 +20,7 @@ jobs: unreal_engine_version: [ "4.26.0", "4.27.0", - "5.0.0", "5.1.0", "5.2.0", "5.3.0", "5.4.0", "5.5.0" + "5.0.0", "5.1.0", "5.2.0", "5.3.0", "5.4.0", "5.5.0", "5.6.0" ] version: ["free", "full"] diff --git a/AdvancedControlFlow/AdvancedControlFlow.uplugin b/AdvancedControlFlow/AdvancedControlFlow.uplugin index f1117ea..2b7bcf6 100644 --- a/AdvancedControlFlow/AdvancedControlFlow.uplugin +++ b/AdvancedControlFlow/AdvancedControlFlow.uplugin @@ -4,7 +4,7 @@ "VersionName": "1.6.0", "FriendlyName": "Advanced Control Flow", "Description": "Blueprint nodes to realize the complex control flow", - "EngineVersion": "5.5.0", + "EngineVersion": "5.6.0", "Category": "Other", "CreatedBy": "nutti (Colory Games)", "CreatedByURL": "https://github.com/colory-games/UEPlugin-AdvancedControlFlow", diff --git a/README.md b/README.md index 0e462d6..1ff0c2c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ By using this plugin, you can realize this case with only one Multi-Branch node. This plugin supports on the below environment. -* Unreal Engine Version: 4.26-4.27 / 5.0-5.5 +* Unreal Engine Version: 4.26-4.27 / 5.0-5.6 * Development Platforms: Windows / macOS / Linux * Target Build Platforms: All platforms diff --git a/tools/remove_code.sh b/tools/remove_code.sh index 2e847a3..bb5b493 100644 --- a/tools/remove_code.sh +++ b/tools/remove_code.sh @@ -6,7 +6,7 @@ set -eEu SUPPORTED_VERSIONS=( "4.26.0" "4.27.0" - "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0" "5.5.0" + "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0" "5.5.0" "5.6.0" ) function usage() { diff --git a/tools/replace_engine_version.sh b/tools/replace_engine_version.sh index 928a153..a8d53c4 100644 --- a/tools/replace_engine_version.sh +++ b/tools/replace_engine_version.sh @@ -6,7 +6,7 @@ set -eEu SUPPORTED_VERSIONS=( "4.26.0" "4.27.0" - "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0" "5.5.0" + "5.0.0" "5.1.0" "5.2.0" "5.3.0" "5.4.0" "5.5.0" "5.6.0" ) function usage() { @@ -33,6 +33,6 @@ if [ ${supported} -eq 0 ]; then fi for file in `find ${source_dir} -name "*.uplugin"`; do - sed -i -e "s/\"EngineVersion\": \"5.5.0\",/\"EngineVersion\": \"${engine_version}\",/g" ${file} + sed -i -e "s/\"EngineVersion\": \"5.6.0\",/\"EngineVersion\": \"${engine_version}\",/g" ${file} echo "Replaced engine version in ${file}" done From 83f5ecaff1b89ebf8a81697d51cb3216c127a1f1 Mon Sep 17 00:00:00 2001 From: nutti Date: Mon, 19 May 2025 17:23:44 +0530 Subject: [PATCH 02/12] Support Unreal Engine 5.6 --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1dd7c16..50e75ae 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -47,7 +47,7 @@ jobs: mv AdvancedControlFlow_UE${{ matrix.unreal_engine_version }}_${{ matrix.version }}.zip release-plugin-${{ matrix.version }} - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: AdvancedControlFlow_${{ matrix.version }} path: "release-plugin-${{ matrix.version }}" @@ -66,7 +66,7 @@ jobs: mv samples/SampleProject.zip release-sample - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: SampleProject path: "release-sample" From 8c6e4da78776eb6671d93eb894a0ed33e78b44f8 Mon Sep 17 00:00:00 2001 From: nutti Date: Mon, 19 May 2025 17:30:21 +0530 Subject: [PATCH 03/12] Support Unreal Engine 5.6 --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 50e75ae..9f8f9cf 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -49,8 +49,8 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: AdvancedControlFlow_${{ matrix.version }} - path: "release-plugin-${{ matrix.version }}" + name: AdvancedControlFlow_${{ matrix.version }}_${{ matrix.unreal_engine_version }} + path: "release-plugin-${{ matrix.version }}-${{ matrix.unreal_engine_version }}" sample-pack: name: Pack sample sources @@ -93,7 +93,7 @@ jobs: run: | set -x assets=() - for asset in dist/AdvancedControlFlow_free/*.zip; do + for asset in dist/AdvancedControlFlow_free_*/*.zip; do assets+=("-a" "$asset") done for asset in dist/SampleProject/*.zip; do From d8a4eec0d69c1dc8286934e9091f666e422d2bb1 Mon Sep 17 00:00:00 2001 From: nutti Date: Mon, 19 May 2025 17:36:11 +0530 Subject: [PATCH 04/12] Support Unreal Engine 5.6 --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9f8f9cf..7d59834 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,9 +42,9 @@ jobs: - name: Compress plugin's sources run: | - mkdir release-plugin-${{ matrix.version }} + mkdir release-plugin-${{ matrix.version }}-${{ matrix.unreal_engine_version }} zip -r AdvancedControlFlow_UE${{ matrix.unreal_engine_version }}_${{ matrix.version }}.zip AdvancedControlFlow - mv AdvancedControlFlow_UE${{ matrix.unreal_engine_version }}_${{ matrix.version }}.zip release-plugin-${{ matrix.version }} + mv AdvancedControlFlow_UE${{ matrix.unreal_engine_version }}_${{ matrix.version }}.zip release-plugin-${{ matrix.version }}-${{ matrix.unreal_engine_version }} - name: Upload artifact uses: actions/upload-artifact@v4 @@ -80,7 +80,7 @@ jobs: - name: Checkout repo uses: actions/checkout@v2 - name: Fetch Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: dist - name: Install hub command From d17aabac1f983800adfaec05db436e3831fb66fa Mon Sep 17 00:00:00 2001 From: nutti Date: Mon, 19 May 2025 17:40:44 +0530 Subject: [PATCH 05/12] Support Unreal Engine 5.6 --- .github/workflows/release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7d59834..30445fa 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,15 +42,15 @@ jobs: - name: Compress plugin's sources run: | - mkdir release-plugin-${{ matrix.version }}-${{ matrix.unreal_engine_version }} + mkdir release-plugin-${{ matrix.version }} zip -r AdvancedControlFlow_UE${{ matrix.unreal_engine_version }}_${{ matrix.version }}.zip AdvancedControlFlow - mv AdvancedControlFlow_UE${{ matrix.unreal_engine_version }}_${{ matrix.version }}.zip release-plugin-${{ matrix.version }}-${{ matrix.unreal_engine_version }} + mv AdvancedControlFlow_UE${{ matrix.unreal_engine_version }}_${{ matrix.version }}.zip release-plugin-${{ matrix.version }} - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: AdvancedControlFlow_${{ matrix.version }}_${{ matrix.unreal_engine_version }} - path: "release-plugin-${{ matrix.version }}-${{ matrix.unreal_engine_version }}" + name: AdvancedControlFlow_${{ matrix.version }}_{{ matrix.unreal_engine_version }} + path: "release-plugin-${{ matrix.version }}" sample-pack: name: Pack sample sources From 89dcd1186cfb20dbcc73aaffcb43278f6b40aa93 Mon Sep 17 00:00:00 2001 From: nutti Date: Mon, 19 May 2025 18:17:13 +0530 Subject: [PATCH 06/12] Support Unreal Engine 5.6 --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 30445fa..160340d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -49,7 +49,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: AdvancedControlFlow_${{ matrix.version }}_{{ matrix.unreal_engine_version }} + name: AdvancedControlFlow_${{ matrix.version }}_${{ matrix.unreal_engine_version }} path: "release-plugin-${{ matrix.version }}" sample-pack: From af00e97a8d7379a92991cb1a95e1ee4101534eb0 Mon Sep 17 00:00:00 2001 From: nutti Date: Tue, 20 May 2025 21:39:42 +0530 Subject: [PATCH 07/12] Fix: CI error --- .github/workflows/release.yaml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 160340d..88c8ce2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -52,6 +52,33 @@ jobs: name: AdvancedControlFlow_${{ matrix.version }}_${{ matrix.unreal_engine_version }} path: "release-plugin-${{ matrix.version }}" + merge-plugin-pack: + name: Merge packed plugins + runs-on: ubuntu-latest + needs: [plugin-pack] + strategy: + fail-fast: false + matrix: + version: + ["free", "full"] + steps: + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + pattern: AdvancedControlFlow_${{ matrix.version }}_* + merge-multiple: true + + - name: Updload artifacts + uses: actions/upload-artifact@v4 + with: + name: AdvancedControlFlow_${{ matrix.version }} + path: "release-plugin-${{ matrix.version }}" + + - name: Delete unused artifacts + uses: geekyeggo/delete-artifact@v5 + with: + name: AdvancedControlFlow_${{ matrix.version }}_* + sample-pack: name: Pack sample sources runs-on: ubuntu-latest @@ -73,7 +100,7 @@ jobs: publish: name: Publish - needs: [plugin-pack, sample-pack] + needs: [merge-plugin-pack, sample-pack] if: startsWith(github.ref, 'refs/tags/v') runs-on: ubuntu-latest steps: @@ -93,7 +120,7 @@ jobs: run: | set -x assets=() - for asset in dist/AdvancedControlFlow_free_*/*.zip; do + for asset in dist/AdvancedControlFlow_free/*.zip; do assets+=("-a" "$asset") done for asset in dist/SampleProject/*.zip; do From 9562cdcada87f51170f5303d31c46e40353c2ade Mon Sep 17 00:00:00 2001 From: nutti Date: Tue, 20 May 2025 21:47:36 +0530 Subject: [PATCH 08/12] Fix: CI error --- .github/workflows/release.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 88c8ce2..5ae2d0b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -68,6 +68,11 @@ jobs: pattern: AdvancedControlFlow_${{ matrix.version }}_* merge-multiple: true + - name: Move artifacts + run: | + mkdir release-plugin-${{ matrix.version }} + mv dist/AdvancedControlFlow_${{ matrix.version }}_* release-plugin-${{ matrix.version }} + - name: Updload artifacts uses: actions/upload-artifact@v4 with: From 06d7646857c39bb27d5f2e83d2e2b7666e5b2385 Mon Sep 17 00:00:00 2001 From: nutti Date: Tue, 20 May 2025 21:49:52 +0530 Subject: [PATCH 09/12] Fix: CI error --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5ae2d0b..d69fead 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -67,6 +67,7 @@ jobs: with: pattern: AdvancedControlFlow_${{ matrix.version }}_* merge-multiple: true + path: dist - name: Move artifacts run: | From b0624696f77215fa8124c9edd8c9bf6f5ccb71c0 Mon Sep 17 00:00:00 2001 From: nutti Date: Tue, 20 May 2025 21:51:06 +0530 Subject: [PATCH 10/12] Fix: CI error --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d69fead..2982c43 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -71,6 +71,7 @@ jobs: - name: Move artifacts run: | + ls dist mkdir release-plugin-${{ matrix.version }} mv dist/AdvancedControlFlow_${{ matrix.version }}_* release-plugin-${{ matrix.version }} From b8900e154a08e62fa4af91ab2347f541858b419d Mon Sep 17 00:00:00 2001 From: nutti Date: Tue, 20 May 2025 21:55:10 +0530 Subject: [PATCH 11/12] Fix: CI error --- .github/workflows/release.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2982c43..cb1b405 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -49,7 +49,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: AdvancedControlFlow_${{ matrix.version }}_${{ matrix.unreal_engine_version }} + name: AdvancedControlFlow_${{ matrix.unreal_engine_version }}_${{ matrix.version }} path: "release-plugin-${{ matrix.version }}" merge-plugin-pack: @@ -65,15 +65,14 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v4 with: - pattern: AdvancedControlFlow_${{ matrix.version }}_* + pattern: AdvancedControlFlow_*_${{ matrix.version }} merge-multiple: true path: dist - name: Move artifacts run: | - ls dist mkdir release-plugin-${{ matrix.version }} - mv dist/AdvancedControlFlow_${{ matrix.version }}_* release-plugin-${{ matrix.version }} + mv dist/AdvancedControlFlow_*_${{ matrix.version }}.zip release-plugin-${{ matrix.version }} - name: Updload artifacts uses: actions/upload-artifact@v4 @@ -84,7 +83,7 @@ jobs: - name: Delete unused artifacts uses: geekyeggo/delete-artifact@v5 with: - name: AdvancedControlFlow_${{ matrix.version }}_* + name: AdvancedControlFlow_*_${{ matrix.version }} sample-pack: name: Pack sample sources From 25cec3e359edc3aee7b16b4e324349d66a304cea Mon Sep 17 00:00:00 2001 From: nutti Date: Wed, 11 Jun 2025 21:46:10 +0530 Subject: [PATCH 12/12] Trigger CI commit