diff --git a/.github/workflows/build-package.yaml b/.github/workflows/build-package.yaml index b047f518..9b55026a 100644 --- a/.github/workflows/build-package.yaml +++ b/.github/workflows/build-package.yaml @@ -48,17 +48,9 @@ jobs: esac # Only get the changes that can be built - # Check if the diff contains the word "Scripts" to ensure we only build packages that have changed # Wrap the grep inside an if-statement to avoid exiting script upon non-zero exitcode. DIFF=$(git diff ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} --no-ext-diff --unified=0 \ --exit-code -a --no-prefix -- $FILE | egrep "^\+") - - if echo "$DIFF" | grep Scripts; then - DIFF=$(echo "$DIFF" | grep Scripts) - else - echo "Did not find Scripts changes in file: $FILE. Skipping." - continue - fi PACKAGE=$(echo $DIFF | cut -d'"' -f2) PACKPATH=$(echo $DIFF | egrep -o "package-system/[^ ]*") diff --git a/.github/workflows/promote-packages.yaml b/.github/workflows/promote-packages.yaml index 6671d99d..ae53b995 100644 --- a/.github/workflows/promote-packages.yaml +++ b/.github/workflows/promote-packages.yaml @@ -111,11 +111,12 @@ jobs: hash=$(echo "$content" | awk '{print $1}') PACKAGE_NAME=$(echo "$file" | cut -d'-' -f1-2) # Extract package name without platform PARTIAL_PACKAGE_NAME=$(echo "$PACKAGE_NAME" | cut -d'-' -f1) # Extract the first part of the package name for matching - PLATFORM=$(echo "$file" | cut -d'-' -f5) + PLATFORM=$(echo "$file" | rev | cut -d'-' -f1 | rev) # Determine x86 or aarch64 cmake file name based on file suffix if [[ $file == *linux-aarch64 ]]; then CMAKE_FILE=BuiltInPackages_linux_aarch64.cmake + PLATFORM=linux elif [[ $file == *linux ]]; then CMAKE_FILE=BuiltInPackages_linux_x86_64.cmake else diff --git a/package-system/SPIRVCross/build_config.json b/package-system/SPIRVCross/build_config.json index 7db9aa35..118cbbba 100644 --- a/package-system/SPIRVCross/build_config.json +++ b/package-system/SPIRVCross/build_config.json @@ -1,9 +1,9 @@ { - "git_url":"https://github.com/o3de/SPIRV-Cross.git", - "git_tag":"release-2021.04.29", + "git_url":"https://github.com/KhronosGroup/SPIRV-Cross.git", + "git_tag":"vulkan-sdk-1.3.275.0", "package_name":"SPIRVCross", - "package_version":"2021.04.29-rev1", - "package_url":"https://github.com/03de/SPIRV-Cross", + "package_version":"1.3.275.0-rev1", + "package_url":"https://github.com/KhronosGroup/SPIRV-Cross", "package_license":"Apache-2.0", "package_license_file":"LICENSE", "cmake_find_target":"FindSPIRVCross.cmake", @@ -13,7 +13,7 @@ "cmake_find_template":"FindSPIRVCross.cmake.Windows", "cmake_generate_args_debug":[ "-G", - "\"Visual Studio 16 2019\"", + "\"Visual Studio 17 2022\"", "-A", "x64", "-T", @@ -26,7 +26,7 @@ ], "cmake_generate_args_release":[ "-G", - "\"Visual Studio 16 2019\"", + "\"Visual Studio 17 2022\"", "-A", "x64", "-T", diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index 031b3925..d19cc61f 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -34,7 +34,7 @@ "NvCloth-v1.1.6-4-gd243404-pr58-rev1-ios": "package-system/NvCloth/build_package_image.py --platform-name ios", "poly2tri-7f0487a-rev1-mac": "package-system/poly2tri/build_package_image.py --platform-name mac", "v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd/build_package_image.py --platform-name mac", - "SPIRVCross-2021.04.29-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac --package-root ../../package-system --clean", + "SPIRVCross-1.3.275.0-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac --package-root ../../package-system --clean", "SQLite-3.37.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac --package-root ../../package-system --clean", "squish-ccr-deb557d-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac --package-root ../../package-system --clean", "astc-encoder-3.2-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean", @@ -92,7 +92,7 @@ "poly2tri-7f0487a-rev1-mac": "package-system/poly2tri-mac", "v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd-mac", "mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp-mac", - "SPIRVCross-2021.04.29-rev1-mac": "package-system/SPIRVCross-mac", + "SPIRVCross-1.3.275.0-rev1-mac": "package-system/SPIRVCross-mac", "squish-ccr-deb557d-rev1-mac": "package-system/squish-ccr-mac", "astc-encoder-3.2-rev5-mac": "package-system/astc-encoder-mac", "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-mac": "package-system/DirectXShaderCompilerDxc-mac", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index 05f13959..35dc695d 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -36,7 +36,7 @@ "python-3.10.5-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", "qt-5.15.2-rev9-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean", "sdformat-13.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean", - "SPIRVCross-2021.04.29-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean", + "SPIRVCross-1.3.275.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean", "SQLite-3.37.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux-aarch64 --clean", "squish-ccr-deb557d-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux-aarch64 --clean", "tiff-4.2.0.15-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux-aarch64 --clean", @@ -77,7 +77,7 @@ "python-3.10.5-rev4-linux-aarch64": "package-system/python/temp/python-linux-aarch64", "qt-5.15.2-rev9-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64", "sdformat-13.5.0-rev2-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64", - "SPIRVCross-2021.04.29-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64", + "SPIRVCross-1.3.275.0-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64", "SQLite-3.37.2-rev1-linux-aarch64": "package-system/sqlite/temp/SQLite-linux-aarch64", "squish-ccr-deb557d-rev1-linux-aarch64": "package-system/squish-ccr/temp/squish-ccr-linux-aarch64", "tiff-4.2.0.15-rev3-linux-aarch64": "package-system/tiff/temp/tiff-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index e3dbe269..7fc41e50 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -33,7 +33,7 @@ "v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd/build_package_image.py --platform-name linux", "sdformat-13.5.0-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux --clean", "sdformat-13.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean", - "SPIRVCross-2021.04.29-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux --package-root ../../package-system --clean", + "SPIRVCross-1.3.275.0-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux --package-root ../../package-system --clean", "SQLite-3.37.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux --package-root ../../package-system --clean", "squish-ccr-deb557d-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux --clean", "squish-ccr-deb557d-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux-aarch64 --clean", @@ -75,7 +75,7 @@ "OpenSSL-1.1.1t-rev1-linux-aarch64": "package-system/OpenSSL/temp/OpenSSL-linux-aarch64", "sdformat-13.5.0-rev2-linux": "package-system/sdformat/temp/sdformat-linux", "sdformat-13.5.0-rev2-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64", - "SPIRVCross-2021.04.29-rev1-linux": "package-system/SPIRVCross-linux", + "SPIRVCross-1.3.275.0-rev1-linux": "package-system/SPIRVCross-linux", "squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr/temp/squish-ccr-linux", "squish-ccr-deb557d-rev1-linux-aarch64": "package-system/squish-ccr/temp/squish-ccr-linux-aarch64", "astc-encoder-3.2-rev3-linux": "package-system/astc-encoder-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index c77f595f..a60d9e43 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -53,7 +53,7 @@ "python-3.10.5-rev1-windows": "package-system/python/build_package_image.py", "qt-5.15.2-rev7-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system/Qt/temp --clean", "RapidJSON-1.1.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/RapidJSON --platform-name multiplatform --package-root ../../package-system", - "SPIRVCross-2021.04.29-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean", + "SPIRVCross-1.3.275.0-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean", "SQLite-3.37.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Windows --package-root ../../package-system --clean", "squish-ccr-deb557d-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Windows --package-root ../../package-system --clean", "tiff-4.2.0.15-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Windows --package-root ../../package-system --clean", @@ -124,7 +124,7 @@ "qt-5.15.2-rev7-windows": "package-system/Qt/temp/qt-windows", "RapidJSON-1.1.0-rev1-multiplatform": "package-system/RapidJSON-multiplatform", "RapidXML-1.13-rev1-multiplatform": "package-system/RapidXML-multiplatform", - "SPIRVCross-2021.04.29-rev1-windows": "package-system/SPIRVCross-windows", + "SPIRVCross-1.3.275.0-rev1-windows": "package-system/SPIRVCross-windows", "SQLite-3.37.2-rev1-windows": "package-system/SQLite-windows", "squish-ccr-deb557d-rev1-windows": "package-system/squish-ccr-windows", "tiff-4.2.0.15-rev3-windows": "package-system/tiff-windows",