diff --git a/.github/workflows/validate-sha.yaml b/.github/workflows/validate-sha.yaml index 3bc3411daf..dbe14ab620 100644 --- a/.github/workflows/validate-sha.yaml +++ b/.github/workflows/validate-sha.yaml @@ -41,7 +41,7 @@ jobs: echo 'output<> $GITHUB_OUTPUT echo "$output" >> $GITHUB_OUTPUT echo 'EOF' >> $GITHUB_OUTPUT - echo "$output" | grep -q "^PASSED$" && exit 0 || exit 1 + echo "$output" | grep -q "VALIDATION PASSED" && exit 0 || exit 1 - name: Validate .NET SHA512 id: dotnet @@ -53,7 +53,7 @@ jobs: echo 'output<> $GITHUB_OUTPUT echo "$output" >> $GITHUB_OUTPUT echo 'EOF' >> $GITHUB_OUTPUT - echo "$output" | grep -q "^PASSED$" && exit 0 || exit 1 + echo "$output" | grep -q "VALIDATION PASSED" && exit 0 || exit 1 - name: Post summary if: always() && (steps.changes.outputs.php == 'true' || steps.changes.outputs.dotnet == 'true') diff --git a/build/scripts/validate-dotnet-sha.sh b/build/scripts/validate-dotnet-sha.sh index f7ba679501..b35415bf8c 100755 --- a/build/scripts/validate-dotnet-sha.sh +++ b/build/scripts/validate-dotnet-sha.sh @@ -51,4 +51,4 @@ for prefix in NET_CORE_APP ASPNET_CORE_APP; do done < <(grep -E "^[[:space:]]+${prefix}_[0-9]+:" "$CONSTANTS_FILE") done -[[ $failed -eq 0 ]] && echo "PASSED" || { echo "FAILED"; exit 1; } \ No newline at end of file +[[ $failed -eq 0 ]] && echo "VALIDATION PASSED" || { echo "VALIDATION FAILED"; exit 1; } \ No newline at end of file diff --git a/images/constants.yml b/images/constants.yml index c124c4b983..c34396701a 100644 --- a/images/constants.yml +++ b/images/constants.yml @@ -69,12 +69,12 @@ variables: php81Version_SHA: ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251 php82Version: 8.2.30 php82Version_SHA: bc90523e17af4db46157e75d0c9ef0b9d0030b0514e62c26ba7b513b8c4eb015 - php83Version: 8.3.29 - php83Version_SHA: f7950ca034b15a78f5de9f1b22f4d9bad1dd497114d175cb1672a4ca78077af5 - php84Version: 8.4.16 - php84Version_SHA: f66f8f48db34e9e29f7bfd6901178e9cf4a1b163e6e497716dfcb8f88bcfae30 - php85Version: 8.5.1 - php85Version_SHA: 3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815 + php83Version: 8.3.30 + php83Version_SHA: 67f084d36852daab6809561a7c8023d130ca07fc6af8fb040684dd1414934d48 + php84Version: 8.4.19 + php84Version_SHA: 11f7164ab26d356c31f94d3d69cc0e0707d5d2d6494a221aaeae307c08eaaa1c + php85Version: 8.5.4 + php85Version_SHA: c1569f1f543f6b025c583cdc0e730e5c5833c603618613f1aa8e75d1524b8c91 phpComposerVersion: 2.6.2 python39Version: 3.9.24 python310Version: 3.10.20 diff --git a/platforms/php/versions/bookworm/versionsToBuild.txt b/platforms/php/versions/bookworm/versionsToBuild.txt index 696c203980..f54b50137c 100644 --- a/platforms/php/versions/bookworm/versionsToBuild.txt +++ b/platforms/php/versions/bookworm/versionsToBuild.txt @@ -20,10 +20,13 @@ 8.3.23, 08be64700f703bca6ff1284bf1fdaffa37ae1b9734b6559f8350248e8960a6db, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, 8.3.26, 2f522eefa02c400c94610d07f25c4fd4c771f95e4a1f55102332ccb40663cbd2, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, 8.3.29, f7950ca034b15a78f5de9f1b22f4d9bad1dd497114d175cb1672a4ca78077af5, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, +8.3.30, 67f084d36852daab6809561a7c8023d130ca07fc6af8fb040684dd1414934d48, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, 8.4.3, 5c42173cbde7d0add8249c2e8a0c19ae271f41d8c47d67d72bdf91a88dcc7e4b, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.4, 05a6c9a2cc894dd8be719ecab221b311886d5e0c02cb6fac648dd9b3459681ac, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.6, 089b08a5efef02313483325f3bacd8c4fe311cf1e1e56749d5cc7d059e225631, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.10, 14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.13, b4f27adf30bcf262eacf93c78250dd811980f20f3b90d79a3dc11248681842df, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.16, f66f8f48db34e9e29f7bfd6901178e9cf4a1b163e6e497716dfcb8f88bcfae30, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, -8.5.1, 3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, \ No newline at end of file +8.4.19, 11f7164ab26d356c31f94d3d69cc0e0707d5d2d6494a221aaeae307c08eaaa1c, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, +8.5.1, 3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, +8.5.4, c1569f1f543f6b025c583cdc0e730e5c5833c603618613f1aa8e75d1524b8c91, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, \ No newline at end of file diff --git a/platforms/php/versions/bullseye/versionsToBuild.txt b/platforms/php/versions/bullseye/versionsToBuild.txt index 41ecda6556..7aff919e1c 100644 --- a/platforms/php/versions/bullseye/versionsToBuild.txt +++ b/platforms/php/versions/bullseye/versionsToBuild.txt @@ -66,10 +66,13 @@ 8.3.23, 08be64700f703bca6ff1284bf1fdaffa37ae1b9734b6559f8350248e8960a6db, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, 8.3.26, 2f522eefa02c400c94610d07f25c4fd4c771f95e4a1f55102332ccb40663cbd2, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, 8.3.29, f7950ca034b15a78f5de9f1b22f4d9bad1dd497114d175cb1672a4ca78077af5, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, +8.3.30, 67f084d36852daab6809561a7c8023d130ca07fc6af8fb040684dd1414934d48, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, 8.4.3, 5c42173cbde7d0add8249c2e8a0c19ae271f41d8c47d67d72bdf91a88dcc7e4b, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.4, 05a6c9a2cc894dd8be719ecab221b311886d5e0c02cb6fac648dd9b3459681ac, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.6, 089b08a5efef02313483325f3bacd8c4fe311cf1e1e56749d5cc7d059e225631, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.10, 14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.13, b4f27adf30bcf262eacf93c78250dd811980f20f3b90d79a3dc11248681842df, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, 8.4.16, f66f8f48db34e9e29f7bfd6901178e9cf4a1b163e6e497716dfcb8f88bcfae30, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, -8.5.1, 3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, \ No newline at end of file +8.4.19, 11f7164ab26d356c31f94d3d69cc0e0707d5d2d6494a221aaeae307c08eaaa1c, AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6, +8.5.1, 3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, +8.5.4, c1569f1f543f6b025c583cdc0e730e5c5833c603618613f1aa8e75d1524b8c91, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, \ No newline at end of file diff --git a/platforms/php/versions/noble/versionsToBuild.txt b/platforms/php/versions/noble/versionsToBuild.txt index 358cc80ff7..838b1b110f 100644 --- a/platforms/php/versions/noble/versionsToBuild.txt +++ b/platforms/php/versions/noble/versionsToBuild.txt @@ -1,2 +1,3 @@ # version, sha, gpg keys, dockerfile -8.5.1, 3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, \ No newline at end of file +8.5.1, 3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, +8.5.4, c1569f1f543f6b025c583cdc0e730e5c5833c603618613f1aa8e75d1524b8c91, 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4, \ No newline at end of file diff --git a/src/BuildScriptGenerator/PhpVersions.cs b/src/BuildScriptGenerator/PhpVersions.cs index 99f3e11822..20d577ec8f 100644 --- a/src/BuildScriptGenerator/PhpVersions.cs +++ b/src/BuildScriptGenerator/PhpVersions.cs @@ -20,15 +20,15 @@ public static class PhpVersions public const string Composer26Version = "2.6.2"; public const string Composer27Version = "2.7.7"; public const string Composer28Version = "2.8.8"; - public const string Php85Version = "8.5.1"; + public const string Php85Version = "8.5.4"; public const string Php85Keys = "1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4"; - public const string Php85TarSha256 = "3f5bf99ce81201f526d25e288eddb2cfa111d068950d1e9a869530054ff98815"; - public const string Php84Version = "8.4.16"; + public const string Php85TarSha256 = "c1569f1f543f6b025c583cdc0e730e5c5833c603618613f1aa8e75d1524b8c91"; + public const string Php84Version = "8.4.19"; public const string Php84Keys = "AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6"; - public const string Php84TarSha256 = "f66f8f48db34e9e29f7bfd6901178e9cf4a1b163e6e497716dfcb8f88bcfae30"; - public const string Php83Version = "8.3.29"; + public const string Php84TarSha256 = "11f7164ab26d356c31f94d3d69cc0e0707d5d2d6494a221aaeae307c08eaaa1c"; + public const string Php83Version = "8.3.30"; public const string Php83Keys = "1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA"; - public const string Php83TarSha256 = "f7950ca034b15a78f5de9f1b22f4d9bad1dd497114d175cb1672a4ca78077af5"; + public const string Php83TarSha256 = "67f084d36852daab6809561a7c8023d130ca07fc6af8fb040684dd1414934d48"; public const string Php82Version = "8.2.30"; public const string Php82Keys = "1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544"; public const string Php82TarSha256 = "bc90523e17af4db46157e75d0c9ef0b9d0030b0514e62c26ba7b513b8c4eb015";