From 5cb45800e7435fb962e66325bec0b4dc7a8a017d Mon Sep 17 00:00:00 2001 From: Shish Date: Fri, 13 Sep 2024 18:51:40 +0100 Subject: [PATCH 1/4] ubuntu-latest is not actually latest --- .github/workflows/auto-regenerate.yml | 2 +- .github/workflows/continuous-integration.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto-regenerate.yml b/.github/workflows/auto-regenerate.yml index 19803e00..30d713f8 100644 --- a/.github/workflows/auto-regenerate.yml +++ b/.github/workflows/auto-regenerate.yml @@ -9,7 +9,7 @@ jobs: auto-regenerate: name: "Auto Regenerate" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-24.04" steps: - name: "Checkout" uses: "actions/checkout@v4" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 80fa2231..2f138bcc 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -12,7 +12,7 @@ on: jobs: fetch_defs: name: "Fetch Definitions" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-24.04" outputs: date: ${{ steps.date.outputs.date }} steps: @@ -42,7 +42,7 @@ jobs: generator_tests: name: "Generator Tests" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-24.04" needs: "fetch_defs" strategy: matrix: @@ -88,7 +88,7 @@ jobs: generated_tests: name: "Generated Tests" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-24.04" needs: "fetch_defs" strategy: matrix: @@ -129,7 +129,7 @@ jobs: check_sync: name: "Check Sync" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-24.04" needs: "fetch_defs" steps: - name: "Checkout" @@ -162,7 +162,7 @@ jobs: rector: name: "Rector Tests" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-24.04" steps: - name: "Checkout" uses: "actions/checkout@v4" From a365d79981352137015ccbe922b80697d6e03b34 Mon Sep 17 00:00:00 2001 From: Shish Date: Sun, 15 Sep 2024 09:27:26 +0100 Subject: [PATCH 2/4] avoid setting the regen workflow to "failed" if it does the regen --- .github/workflows/auto-regenerate.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-regenerate.yml b/.github/workflows/auto-regenerate.yml index 30d713f8..fb846bec 100644 --- a/.github/workflows/auto-regenerate.yml +++ b/.github/workflows/auto-regenerate.yml @@ -43,11 +43,12 @@ jobs: run: "composer dump-autoload" - name: "Regenerate files" - run: "./safe.php generate && git diff --exit-code" + id: regen + run: "./safe.php generate && git diff --exit-code && (echo regen=no-diff >> $GITHUB_OUTPUT) || (echo regen=diff >> $GITHUB_OUTPUT)" working-directory: "generator" - name: "Create a pr if the files are different" - if: ${{ failure() }} + if: steps.regen.outputs.regen == "diff" uses: peter-evans/create-pull-request@v6 with: commit-message: "Automatically regenerate the files" From 7fd6955ed1a8b69212898378ecaf2d327ca9783a Mon Sep 17 00:00:00 2001 From: Shish Date: Sun, 15 Sep 2024 09:30:36 +0100 Subject: [PATCH 3/4] also allow sync on manual button push --- .github/workflows/auto-regenerate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-regenerate.yml b/.github/workflows/auto-regenerate.yml index fb846bec..d5a5fa7f 100644 --- a/.github/workflows/auto-regenerate.yml +++ b/.github/workflows/auto-regenerate.yml @@ -4,6 +4,7 @@ name: "Auto Regenerate" on: schedule: - cron: '0 3 * * *' + workflow_dispatch: jobs: From 27860c71e38aa6e739b195e0fa79de9114cf096e Mon Sep 17 00:00:00 2001 From: Shish Date: Sun, 15 Sep 2024 09:32:14 +0100 Subject: [PATCH 4/4] sync --- generated/image.php | 6 +++--- generated/openssl.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/generated/image.php b/generated/image.php index 0f84951f..0db4240f 100644 --- a/generated/image.php +++ b/generated/image.php @@ -498,7 +498,7 @@ function imageconvolution($image, array $matrix, float $divisor, float $offset): /** * Copy a part of src_image onto * dst_image starting at the x,y coordinates - * src_x, src_y with + * src_x, src_y with * a width of src_width and a height of * src_height. The portion defined will be copied * onto the x,y coordinates, dst_x and @@ -528,7 +528,7 @@ function imagecopy($dst_image, $src_image, int $dst_x, int $dst_y, int $src_x, i /** * Copy a part of src_image onto * dst_image starting at the x,y coordinates - * src_x, src_y with + * src_x, src_y with * a width of src_width and a height of * src_height. The portion defined will be copied * onto the x,y coordinates, dst_x and @@ -564,7 +564,7 @@ function imagecopymerge($dst_image, $src_image, int $dst_x, int $dst_y, int $src /** * imagecopymergegray copy a part of src_image onto * dst_image starting at the x,y coordinates - * src_x, src_y with + * src_x, src_y with * a width of src_width and a height of * src_height. The portion defined will be copied * onto the x,y coordinates, dst_x and diff --git a/generated/openssl.php b/generated/openssl.php index 7a3ebb8a..e4552276 100644 --- a/generated/openssl.php +++ b/generated/openssl.php @@ -1075,7 +1075,8 @@ function openssl_pkey_get_public($public_key): \OpenSSLAsymmetricKey * bits) using options. See * openssl_csr_new for more information about * options. - * @return resource Returns an OpenSSLAsymmetricKey instance for the pkey on success. + * @return resource Returns an OpenSSLAsymmetricKey instance for + * the pkey on success. * @throws OpensslException * */