Skip to content

Commit 05cd7a2

Browse files
authored
Merge branch 'main' into refactor-verify
2 parents 73c404a + 703ba9a commit 05cd7a2

24 files changed

Lines changed: 347 additions & 196 deletions

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# For syntax help see:
55
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
66

7-
* @googleapis/yoshi-php
7+
* @googleapis/cloud-sdk-php-team

.github/actions/docs/entrypoint.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/actions/docs/sami.php

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
always_check_pr_title: true
2+

.github/release-please.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
releaseType: simple
1+
releaseType: php-yoshi
22
handleGHRelease: true
3-
primaryBranch: main
3+
primaryBranch: main

.github/sync-repo-settings.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ branchProtectionRules:
1010
- 'PHP 8.1 Unit Test'
1111
- 'PHP 8.2 Unit Test'
1212
- 'PHP 8.3 Unit Test'
13-
- 'PHP 8.3 --prefer-lowest Unit Test'
13+
- 'PHP 8.4'
14+
- 'PHP 8.4 --prefer-lowest Unit Test'
1415
- 'PHP Style Check'
1516
- 'cla/google'
1617
requiredApprovingReviewCount: 1
1718
requiresCodeOwnerReviews: true
1819
requiresStrictStatusChecks: true
1920
permissionRules:
20-
- team: yoshi-php-admins
21-
permission: admin
22-
- team: yoshi-php
21+
- team: cloud-sdk-php-team
2322
permission: push

.github/workflows/asset-release.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,34 @@
11
name: Add Release Assets
22

3+
permissions:
4+
contents: write
5+
36
on:
47
release:
58
types: [published]
6-
9+
workflow_dispatch:
10+
inputs:
11+
tag:
12+
description: 'Tag to generate documentation for'
13+
required: true
14+
upload-on-workflow-dispatch:
15+
description: 'Upload assets?'
16+
required: false
17+
default: "false"
718
jobs:
819
asset:
920
runs-on: ${{ matrix.operating-system }}
1021
strategy:
1122
matrix:
1223
operating-system: [ ubuntu-latest ]
13-
php: [ "8.0", "8.3" ]
24+
php: [ "8.1", "8.3" ]
1425

1526
name: Upload Release Assets
1627
steps:
1728
- id: getTag
1829
name: Get Tag
1930
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
2031

21-
- name: Get release
22-
id: get_release
23-
uses: bruceadams/get-release@v1.2.2
24-
env:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26-
2732
- name: Checkout
2833
uses: actions/checkout@v2
2934

@@ -50,14 +55,12 @@ jobs:
5055
zip -d ${fileName} "tests*" || true &&
5156
zip -d ${fileName} "examples*" || true
5257
env:
53-
fileName: google-api-php-client-${{ steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip
58+
fileName: google-api-php-client-${{ inputs.tag || steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip
5459

5560
- name: Upload Release Archive
56-
uses: actions/upload-release-asset@v1
57-
env:
58-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
61+
uses: softprops/action-gh-release@v2
62+
if: github.ref_type == 'tag' || inputs.upload-on-workflow-dispatch == 'true'
5963
with:
60-
upload_url: ${{ steps.get_release.outputs.upload_url }}
61-
asset_path: ./google-api-php-client-${{ steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip
62-
asset_name: google-api-php-client-${{ steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip
63-
asset_content_type: application/zip
64+
tag_name: ${{ inputs.tag || steps.tagName.outputs.tag }}
65+
files: |
66+
./google-api-php-client-${{ inputs.tag || steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip

.github/workflows/docs.yml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
name: Generate Documentation
22
on:
33
push:
4-
branches: [main]
4+
tags:
5+
- "*"
6+
workflow_dispatch:
7+
inputs:
8+
tag:
9+
description: 'Tag to generate documentation for'
10+
required: false
11+
pull_request:
12+
13+
permissions:
14+
contents: write
515

616
jobs:
717
docs:
8-
name: "Generate Project Documentation"
9-
runs-on: ubuntu-latest
10-
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v2
13-
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
14-
- name: Install Dependencies
15-
uses: nick-invision/retry@v1
16-
with:
17-
timeout_minutes: 10
18-
max_attempts: 3
19-
command: composer install
20-
- name: Generate and Push Documentation
21-
uses: docker://php:8.1-cli
22-
env:
23-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
24-
with:
25-
entrypoint: ./.github/actions/docs/entrypoint.sh
26-
- name: Deploy 🚀
27-
uses: JamesIves/github-pages-deploy-action@releases/v3
28-
with:
29-
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
30-
BRANCH: gh-pages
31-
FOLDER: .docs
18+
name: "Generate and Deploy Documentation"
19+
uses: GoogleCloudPlatform/php-tools/.github/workflows/doctum.yml@main
20+
with:
21+
title: "Google Cloud PHP Client"
22+
default_version: ${{ inputs.tag || github.head_ref || github.ref_name }}
23+
exclude_file: aliases.php
24+
tag_pattern: "v2.*"
25+
dry_run: ${{ github.event_name == 'pull_request' }}
26+

.github/workflows/tests.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
php: [ "8.0", "8.1", "8.2", "8.3" ]
14+
php: [ "8.1", "8.2", "8.3", "8.4" ]
1515
composer-flags: [""]
1616
include:
17-
- php: "8.0"
17+
- php: "8.1"
1818
composer-flags: "--prefer-lowest "
19-
- php: "8.3"
19+
- php: "8.4"
2020
composer-flags: "--prefer-lowest "
2121
name: PHP ${{ matrix.php }} ${{ matrix.composer-flags }}Unit Test
2222
steps:
@@ -65,4 +65,22 @@ jobs:
6565
composer install
6666
composer global require phpstan/phpstan
6767
~/.composer/vendor/bin/phpstan analyse
68+
libver-check:
69+
runs-on: ubuntu-latest
70+
name: Verify Google\Client::LIBVER
71+
steps:
72+
73+
- uses: actions/checkout@v2
74+
- name: Setup PHP
75+
uses: shivammathur/setup-php@v2
76+
with:
77+
php-version: '8.1'
78+
- name: Verify libver
79+
run: |
80+
LIBVER=$(php -r 'require "src/Client.php"; echo Google\Client::LIBVER;')
81+
RELEASEVER=$(php -r 'preg_match("/## \[(\d.\d+.\d+)\]\(/", file_get_contents("CHANGELOG.md"), $matches);echo $matches[1];')
82+
if [ "$LIBVER" != "$RELEASEVER" ]; then
83+
echo "Google\Client::LIBVER ($LIBVER) does not equal the current release ($RELEASEVER)."
84+
exit 1
85+
fi
6886

CHANGELOG.md

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,74 @@
11
# Changelog
22

3+
## 2.19.2
4+
5+
## [2.19.1](https://github.com/googleapis/google-api-php-client/compare/v2.19.0...v2.19.1) (2026-03-27)
6+
7+
8+
### Bug Fixes
9+
10+
* Update phpseclib minimum version ([#2709](https://github.com/googleapis/google-api-php-client/issues/2709)) ([7bb27a5](https://github.com/googleapis/google-api-php-client/commit/7bb27a5357905200a9a8affe73a61a0aec69dde7))
11+
12+
## [2.19.0](https://github.com/googleapis/google-api-php-client/compare/v2.18.4...v2.19.0) (2026-01-09)
13+
14+
15+
### Features
16+
17+
* Support firebase/php-jwt version 6.0 and 7.0 ([#2696](https://github.com/googleapis/google-api-php-client/issues/2696)) ([70ea42a](https://github.com/googleapis/google-api-php-client/commit/70ea42a6aa29a1321825c3dcda39cf39174390ea))
18+
19+
20+
### Bug Fixes
21+
22+
* Upload assets release job ([#2671](https://github.com/googleapis/google-api-php-client/issues/2671)) ([0f56ea7](https://github.com/googleapis/google-api-php-client/commit/0f56ea773cb51cc6131c442d112d7fd630b49b5c))
23+
24+
## [2.18.4](https://github.com/googleapis/google-api-php-client/compare/v2.18.3...v2.18.4) (2025-09-29)
25+
26+
27+
### Bug Fixes
28+
29+
* Ensure credentials can be of type FetchAuthTokenInterface ([#2684](https://github.com/googleapis/google-api-php-client/issues/2684)) ([ed70802](https://github.com/googleapis/google-api-php-client/commit/ed70802cc4886ef1f513a2c0b56a8a972db5e7ab))
30+
31+
## [2.18.3](https://github.com/googleapis/google-api-php-client/compare/v2.18.2...v2.18.3) (2025-04-08)
32+
33+
34+
### Bug Fixes
35+
36+
* Convert Finder lazy iterator to array before deletion ([#2663](https://github.com/googleapis/google-api-php-client/issues/2663)) ([c699405](https://github.com/googleapis/google-api-php-client/commit/c6994051af1568359c97d267d9ef34ccbda31387))
37+
38+
## [2.18.2](https://github.com/googleapis/google-api-php-client/compare/v2.18.1...v2.18.2) (2024-12-16)
39+
40+
41+
### Bug Fixes
42+
43+
* Correct type for jwt constructor arg ([#2648](https://github.com/googleapis/google-api-php-client/issues/2648)) ([31a9861](https://github.com/googleapis/google-api-php-client/commit/31a9861af02a8e9070b395f05caed7ffce0ef8be))
44+
45+
## [2.18.1](https://github.com/googleapis/google-api-php-client/compare/v2.18.0...v2.18.1) (2024-11-24)
46+
47+
48+
### Bug Fixes
49+
50+
* Implicitly marking parameter as nullable is deprecated ([#2638](https://github.com/googleapis/google-api-php-client/issues/2638)) ([de57db2](https://github.com/googleapis/google-api-php-client/commit/de57db2fdc0d56de1abbf778b28b77c3347eb3fd))
51+
52+
## [2.18.0](https://github.com/googleapis/google-api-php-client/compare/v2.17.0...v2.18.0) (2024-10-16)
53+
54+
55+
### Features
56+
57+
* **docs:** Use doctum shared workflow for reference docs ([#2618](https://github.com/googleapis/google-api-php-client/issues/2618)) ([242e2cb](https://github.com/googleapis/google-api-php-client/commit/242e2cb09ad5b25b047a862b4d521037e74cae29))
58+
59+
60+
### Bug Fixes
61+
62+
* Explicit token caching issue ([#2358](https://github.com/googleapis/google-api-php-client/issues/2358)) ([dc13e5e](https://github.com/googleapis/google-api-php-client/commit/dc13e5e3f517148d3c66d151a5ab133b7840d8fb))
63+
64+
## [2.17.0](https://github.com/googleapis/google-api-php-client/compare/v2.16.0...v2.17.0) (2024-07-10)
65+
66+
67+
### Features
68+
69+
* Add logger to client constructor config ([#2606](https://github.com/googleapis/google-api-php-client/issues/2606)) ([1f47133](https://github.com/googleapis/google-api-php-client/commit/1f4713329d71111a317cda8ef8603fa1bdc88858))
70+
* Add the protected apiVersion property ([#2588](https://github.com/googleapis/google-api-php-client/issues/2588)) ([7e79f3d](https://github.com/googleapis/google-api-php-client/commit/7e79f3d7be4811f760e19cc4a2c558e04196ec1d))
71+
372
## [2.16.0](https://github.com/googleapis/google-api-php-client/compare/v2.15.4...v2.16.0) (2024-04-24)
473

574

0 commit comments

Comments
 (0)