Skip to content

Commit

Permalink
Merge pull request #10 from shish/reg
Browse files Browse the repository at this point in the history
Reg
  • Loading branch information
shish authored Sep 15, 2024
2 parents 2da9195 + 27860c7 commit 398faa9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/auto-regenerate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ name: "Auto Regenerate"
on:
schedule:
- cron: '0 3 * * *'
workflow_dispatch:

jobs:

auto-regenerate:
name: "Auto Regenerate"
runs-on: "ubuntu-latest"
runs-on: "ubuntu-24.04"
steps:
- name: "Checkout"
uses: "actions/checkout@v4"
Expand Down Expand Up @@ -43,11 +44,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"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:

generator_tests:
name: "Generator Tests"
runs-on: "ubuntu-latest"
runs-on: "ubuntu-24.04"
needs: "fetch_defs"
strategy:
matrix:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

generated_tests:
name: "Generated Tests"
runs-on: "ubuntu-latest"
runs-on: "ubuntu-24.04"
needs: "fetch_defs"
strategy:
matrix:
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions generated/image.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion generated/openssl.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/
Expand Down

0 comments on commit 398faa9

Please sign in to comment.