From 1a8cbd7ac4a1249f29ecf28137aab00732a6347d Mon Sep 17 00:00:00 2001 From: Arjun Sreedharan Date: Thu, 29 May 2025 15:14:05 -0400 Subject: [PATCH 1/2] outstanding updates --- manifest.yml | 82 ++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/manifest.yml b/manifest.yml index 46ed3c722..2f619fec4 100644 --- a/manifest.yml +++ b/manifest.yml @@ -23,9 +23,9 @@ default_versions: - name: newrelic version: 10.21.0.11 - name: nginx - version: 1.27.4 + version: 1.27.5 - name: composer - version: 2.8.7 + version: 2.8.8 url_to_dependency_map: - match: appdynamics-(\d+\.\d+\.\d+-\d+) name: appdynamics @@ -66,14 +66,14 @@ dependencies: osl: https://docs.appdynamics.com/display/DASH/Legal+Notices source_sha256: '04904a9ddc45bab06b80fa6c32671e82d8edfbaecf8dc943720db7b5c790ec8d' - name: composer - version: 2.8.7 - uri: https://buildpacks.cloudfoundry.org/dependencies/composer/composer_2.8.7_linux_noarch_any-stack_25285078.phar - sha256: 2528507840901565fe6cecd19c7e9f8983b8d91b5eb4bab1599b14254401e675 + version: 2.8.8 + uri: https://buildpacks.cloudfoundry.org/dependencies/composer/composer_2.8.8_linux_noarch_any-stack_957263e2.phar + sha256: 957263e284b9f7a13d7f475dc65f3614d151b0c4dcc7e8761f7e7f749447fb68 cf_stacks: - cflinuxfs4 - cflinuxfs3 - source: https://github.com/composer/composer/releases/download/2.8.7/composer.phar - source_sha256: 2528507840901565fe6cecd19c7e9f8983b8d91b5eb4bab1599b14254401e675 + source: https://github.com/composer/composer/releases/download/2.8.8/composer.phar + source_sha256: 957263e284b9f7a13d7f475dc65f3614d151b0c4dcc7e8761f7e7f749447fb68 - name: httpd version: 2.4.63 uri: https://buildpacks.cloudfoundry.org/dependencies/httpd/httpd_2.4.63_linux_x64_cflinuxfs3_0ba61a88.tgz @@ -115,21 +115,21 @@ dependencies: source: http://nginx.org/download/nginx-1.26.3.tar.gz source_sha256: 69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa - name: nginx - version: 1.27.4 - uri: https://buildpacks.cloudfoundry.org/dependencies/nginx-static/nginx-static_1.27.4_linux_x64_cflinuxfs3_d5dddd48.tgz - sha256: d5dddd4877f70762dd784ecb8b84c3a71da25eb62f6b9bed8d34ebfc92c9e34d + version: 1.27.5 + uri: https://buildpacks.cloudfoundry.org/dependencies/nginx-static/nginx-static_1.27.5_linux_x64_cflinuxfs3_5f8f4f9a.tgz + sha256: 5f8f4f9a4ac12c723e6820f0533bd46944590f07fe2770fc1a2c569b3d155c41 cf_stacks: - cflinuxfs3 - source: http://nginx.org/download/nginx-1.27.4.tar.gz - source_sha256: 294816f879b300e621fa4edd5353dd1ec00badb056399eceb30de7db64b753b2 + source: http://nginx.org/download/nginx-1.27.5.tar.gz + source_sha256: e96acebb9c2a6db8a000c3dd1b32ecba1b810f0cd586232d4d921e376674dd0e - name: nginx - version: 1.27.4 - uri: https://buildpacks.cloudfoundry.org/dependencies/nginx-static/nginx-static_1.27.4_linux_x64_cflinuxfs4_08db9b04.tgz - sha256: '08db9b04a2a2b422e3745668410afbe3f1bceb245d70b43336f4f70da5a532e5' + version: 1.27.5 + uri: https://buildpacks.cloudfoundry.org/dependencies/nginx-static/nginx-static_1.27.5_linux_x64_cflinuxfs4_292d0853.tgz + sha256: 292d08531aa8d15f7ac239871987be7b52d36152fbb0cf3f5329627f3a778a2d cf_stacks: - cflinuxfs4 - source: http://nginx.org/download/nginx-1.27.4.tar.gz - source_sha256: 294816f879b300e621fa4edd5353dd1ec00badb056399eceb30de7db64b753b2 + source: http://nginx.org/download/nginx-1.27.5.tar.gz + source_sha256: e96acebb9c2a6db8a000c3dd1b32ecba1b810f0cd586232d4d921e376674dd0e - name: php version: 8.1.31 uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.1.31_linux_x64_cflinuxfs3-dev_532e374f.tgz @@ -1147,13 +1147,13 @@ dependencies: - name: zlib version: - name: php - version: 8.3.14 - uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.3.14_linux_x64_cflinuxfs3-dev_1ff6913d.tgz - sha256: 1ff6913d4a634dd3d72d9951311ba55f0dd54c1a2afca553411dac9bed62952c + version: 8.3.19 + uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.3.19_linux_x64_cflinuxfs3-dev_ff25905b.tgz + sha256: ff25905bd4bfd6d35c912823812c7ffc08ff45b1c6b612229374e856610bc7c0 cf_stacks: - cflinuxfs3 - source: https://php.net/distributions/php-8.3.14.tar.gz - source_sha256: e4ee602c31e2f701c9f0209a2902dd4802727431246a9155bf56dda7bcf7fb4a + source: https://php.net/distributions/php-8.3.19.tar.gz + source_sha256: bb21d1a5eb9a8b27668b2926fa9279a5878bb6fdee55450621f7865e062dcf3a dependencies: - name: amqp version: 2.1.2 @@ -1196,7 +1196,7 @@ dependencies: - name: memcached version: 3.2.0 - name: mongodb - version: 1.19.1 + version: 1.18.1 - name: msgpack version: 2.2.0 - name: mysqli @@ -1224,7 +1224,7 @@ dependencies: - name: pgsql version: - name: phalcon - version: 5.7.0 + version: 5.6.2 - name: phpiredis version: 1.0.1 - name: pspell @@ -1271,13 +1271,13 @@ dependencies: - name: zlib version: - name: php - version: 8.3.14 - uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.3.14_linux_x64_cflinuxfs4_47d48c30.tgz - sha256: 47d48c30e28d4874389bb23c2d862522ae96abef2e4872a0c5ab0dff31c27c2d + version: 8.3.19 + uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.3.19_linux_x64_cflinuxfs4_e0466e9c.tgz + sha256: e0466e9c4463ad710b6bceee6a48d6ea629738c0c812b88c2d3c9f25d1aca6e1 cf_stacks: - cflinuxfs4 - source: https://php.net/distributions/php-8.3.14.tar.gz - source_sha256: e4ee602c31e2f701c9f0209a2902dd4802727431246a9155bf56dda7bcf7fb4a + source: https://php.net/distributions/php-8.3.19.tar.gz + source_sha256: bb21d1a5eb9a8b27668b2926fa9279a5878bb6fdee55450621f7865e062dcf3a dependencies: - name: amqp version: 2.1.2 @@ -1320,7 +1320,7 @@ dependencies: - name: memcached version: 3.2.0 - name: mongodb - version: 1.19.1 + version: 1.18.1 - name: msgpack version: 2.2.0 - name: mysqli @@ -1348,7 +1348,7 @@ dependencies: - name: pgsql version: - name: phalcon - version: 5.7.0 + version: 5.6.2 - name: phpiredis version: 1.0.1 - name: pspell @@ -1395,13 +1395,13 @@ dependencies: - name: zlib version: - name: php - version: 8.3.19 - uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.3.19_linux_x64_cflinuxfs3-dev_ff25905b.tgz - sha256: ff25905bd4bfd6d35c912823812c7ffc08ff45b1c6b612229374e856610bc7c0 + version: 8.3.21 + uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.3.21_linux_x64_cflinuxfs3-dev_ca671d28.tgz + sha256: ca671d2873c1be5738199891c9a629afaca5ae89b2a3780e0a09151781165915 cf_stacks: - cflinuxfs3 - source: https://php.net/distributions/php-8.3.19.tar.gz - source_sha256: bb21d1a5eb9a8b27668b2926fa9279a5878bb6fdee55450621f7865e062dcf3a + source: https://php.net/distributions/php-8.3.21.tar.gz + source_sha256: e7f1748c1fa3d2bf8ef2e00508bd62325ba68c3b830b253bc561225a9ba5457d dependencies: - name: amqp version: 2.1.2 @@ -1519,13 +1519,13 @@ dependencies: - name: zlib version: - name: php - version: 8.3.19 - uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.3.19_linux_x64_cflinuxfs4_e0466e9c.tgz - sha256: e0466e9c4463ad710b6bceee6a48d6ea629738c0c812b88c2d3c9f25d1aca6e1 + version: 8.3.21 + uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.3.21_linux_x64_cflinuxfs4_699bf9bc.tgz + sha256: 699bf9bc863a8d0707fbc422d0351cdd7b1bc865b067ecc146838589c06105e7 cf_stacks: - cflinuxfs4 - source: https://php.net/distributions/php-8.3.19.tar.gz - source_sha256: bb21d1a5eb9a8b27668b2926fa9279a5878bb6fdee55450621f7865e062dcf3a + source: https://php.net/distributions/php-8.3.21.tar.gz + source_sha256: e7f1748c1fa3d2bf8ef2e00508bd62325ba68c3b830b253bc561225a9ba5457d dependencies: - name: amqp version: 2.1.2 From f6150af0b802a40b7b397067eb44be0ebb500c6f Mon Sep 17 00:00:00 2001 From: Arjun Sreedharan Date: Thu, 29 May 2025 15:17:43 -0400 Subject: [PATCH 2/2] target master not develop --- .../dependency-deprecation-reminder.yml | 2 +- .github/workflows/release-reminder.yml | 98 ------------------- .github/workflows/synchronize-labels.yml | 2 +- .github/workflows/test-pull-request.yml | 1 - CONTRIBUTING.md | 2 +- PULL_REQUEST_TEMPLATE | 2 +- 6 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 .github/workflows/release-reminder.yml diff --git a/.github/workflows/dependency-deprecation-reminder.yml b/.github/workflows/dependency-deprecation-reminder.yml index 3a4342f9b..b6d57f2be 100644 --- a/.github/workflows/dependency-deprecation-reminder.yml +++ b/.github/workflows/dependency-deprecation-reminder.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - ref: develop + ref: master - name: Get deprecations id: deprecations diff --git a/.github/workflows/release-reminder.yml b/.github/workflows/release-reminder.yml deleted file mode 100644 index a5998d401..000000000 --- a/.github/workflows/release-reminder.yml +++ /dev/null @@ -1,98 +0,0 @@ -name: Release Reminder - -on: - schedule: - - cron: '0 0 * * 4' # Run at midnight on Thursdays - workflow_dispatch: {} - -jobs: - determine-date: - name: Release buildpacks on 2nd and 4th Thursday of the month - runs-on: ubuntu-22.04 - outputs: - should_run: ${{ steps.should_run.outputs.bool }} - steps: - - name: Should run - id: should_run - run: | - if [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then - echo "Skipping date check, because workflow was run manually" - echo "bool=true" >> "${GITHUB_OUTPUT}" - else - day_of_month=$(date +%d) - # Check if it's the second or fourth Thursday of the month - # second thursday of the month will always be between day 8 and 14 (inclusive) - if [[ "$day_of_month" -ge "8" && "$day_of_month" -le "14" ]]; then - echo "It's the second Thursday of the month" - echo "bool=true" >> "${GITHUB_OUTPUT}" - # fourth thursday of the month will always be between day 21 and 28 (inclusive) - elif [[ "$day_of_month" -ge "22" && "$day_of_month" -le "28" ]]; then - echo "It's the fourth Thursday of the month" - echo "bool=true" >> "${GITHUB_OUTPUT}" - else - echo "It's another Thursday of the month" - echo "bool=false" >> "${GITHUB_OUTPUT}" - fi - fi - reminder: - name: Reminder - runs-on: ubuntu-22.04 - needs: [ determine-date ] - if: ${{ needs.determine-date.outputs.should_run == 'true' }} - steps: - - name: Get Date - id: date - run: | - today=$(date +'%m-%d') - window_close_date=$(date -d "+5 days" +'%m-%d') - - echo "today=$today" >> "${GITHUB_OUTPUT}" - echo "window_close_date=$window_close_date" >> "${GITHUB_OUTPUT}" - - - name: Checkout - uses: actions/checkout@v3 - with: - token: ${{ secrets.CF_BOT_GITHUB_TOKEN }} - ref: develop - fetch-depth: 0 - - - name: Get Latest Version - id: latest-version - run: | - echo "val=$(git describe --abbrev=0 --tag)" >> "${GITHUB_OUTPUT}" - - - name: PHP specific task - id: php-specific - if: github.repository == 'cloudfoundry/php-buildpack' - run: | - echo 'task=* Bump PHP modules. See [doc](https://github.com/cloudfoundry/buildpacks-ci/tree/master/scripts/php-modules#pre-buildpack-release-task)' >> "${GITHUB_OUTPUT}" - echo 'title=Bump PHP Modules and ' >> "${GITHUB_OUTPUT}" - - - name: File Issue - id: file-issue - uses: paketo-buildpacks/github-config/actions/issue/file@main - with: - token: ${{ secrets.CF_BOT_GITHUB_TOKEN }} - repo: ${{ github.repository }} - issue_title: "${{ steps.php-specific.outputs.title }}Release: ${{ github.event.repository.name }} (${{ steps.date.outputs.today }})" - issue_body: | - Release reminder for ${{ github.event.repository.name }} - - The ideal release date window for this buildpack starts on: ${{ steps.date.outputs.today }} and ends on ${{ steps.date.outputs.window_close_date }}. - - ${{ steps.php-specific.outputs.task }} - * See [diff from latest version]("https://github.com/${{ github.repository }}/compare/${{ steps.latest-version.outputs.val }}..develop") and validate if a release is required. - * Make sure the latest commit on `develop` has passed tests on the [CI](https://buildpacks.ci.cf-app.com/teams/main/pipelines/${{ github.event.repository.name }}) - * Refer [release instructions](https://github.com/pivotal-cf/tanzu-buildpacks/wiki/Releasing-CF-Buildpacks). (private link) - - - name: Add issue to project - id: issue-to-proj - uses: paketo-buildpacks/github-config/actions/issue/add-to-project@main - with: - # CF buildpacks project - https://github.com/orgs/cloudfoundry/projects/37 - project-org: cloudfoundry - project-num: 37 - field-name: Workstream - option-name: Release Train - issue-node-id: ${{ steps.file-issue.outputs.node-id }} - token: ${{ secrets.CF_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/synchronize-labels.yml b/.github/workflows/synchronize-labels.yml index df45d3c5a..c4870278d 100644 --- a/.github/workflows/synchronize-labels.yml +++ b/.github/workflows/synchronize-labels.yml @@ -3,7 +3,7 @@ name: Synchronize Labels on: push: branches: - - develop + - master paths: - .github/labels.yml workflow_dispatch: {} diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml index cb3f6eb4c..9d4db2d88 100644 --- a/.github/workflows/test-pull-request.yml +++ b/.github/workflows/test-pull-request.yml @@ -3,7 +3,6 @@ name: Test Pull Request on: pull_request: branches: - - develop - master jobs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ac8ad6516..d98ed1984 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,5 +19,5 @@ Use `./scripts/unit`, `./scripts/integration`, and `./scripts/brats`. The integr Please include integration tests (in `src/php/integration`) and corresponding fixtures (in `fixtures`) where necessary to cover any functionality that is introduced. -**NOTE:** When submitting a pull request, *please make sure to target the `develop` branch*, so that your changes are up-to-date and easy to integrate with the most recent work on the buildpack. Thanks! +**NOTE:** When submitting a pull request, *please make sure to target the `master` branch*, so that your changes are up-to-date and easy to integrate with the most recent work on the buildpack. Thanks! diff --git a/PULL_REQUEST_TEMPLATE b/PULL_REQUEST_TEMPLATE index 01dcb691b..73c4a5f84 100644 --- a/PULL_REQUEST_TEMPLATE +++ b/PULL_REQUEST_TEMPLATE @@ -6,6 +6,6 @@ Thanks for contributing to the buildpack. To speed up the process of reviewing y * [ ] I have viewed signed and have submitted the Contributor License Agreement -* [ ] I have made this pull request to the `develop` branch +* [ ] I have made this pull request to the `master` branch * [ ] I have added an integration test