Skip to content

Commit

Permalink
chore: switch master to main (#121)
Browse files Browse the repository at this point in the history
  • Loading branch information
bshaffer committed Dec 2, 2021
1 parent 41ab525 commit c693c8c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/conformance.yml
@@ -1,11 +1,9 @@
name: PHP Conformance CI
on:
pull_request:
branches:
- master
push:
branches:
- master
- main
pull_request:
workflow_dispatch:
jobs:
build:
Expand Down Expand Up @@ -81,4 +79,4 @@ jobs:
functionType: 'cloudevent'
useBuildpacks: false
validateMapping: true
cmd: "'php -S localhost:8080 router.php'"
cmd: "'php -S localhost:8080 router.php'"
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Expand Up @@ -2,7 +2,7 @@ name: PHP Lint CI
on:
push:
branches:
- master
- main
pull_request:
jobs:
php-cs-fixer:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit.yaml
Expand Up @@ -2,7 +2,7 @@ name: PHP Unit CI
on:
push:
branches:
- master
- main
pull_request:
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -196,7 +196,7 @@ gcloud run deploy my-cloud-function \
After your instance deploys, you can access it at the URL provided, or view it
in the [Cloud Console][cloud-run-console].

[functions-samples]: https://github.com/GoogleCloudPlatform/php-docs-samples/tree/master/functions
[functions-samples]: https://github.com/GoogleCloudPlatform/php-docs-samples/tree/main/functions
[functions-how-to]: https://cloud.google.com/functions/docs/how-to
[gcloud]: https://cloud.google.com/sdk/gcloud/
[gcloud-auth]: https://cloud.google.com/sdk/docs/authorizing
Expand Down
2 changes: 1 addition & 1 deletion src/LegacyEventMapper.php
Expand Up @@ -23,7 +23,7 @@ class LegacyEventMapper
{
// Maps background/legacy event types to their equivalent CloudEvent types.
// For more info on event mappings see
// https://github.com/GoogleCloudPlatform/functions-framework-conformance/blob/master/docs/mapping.md
// https://github.com/GoogleCloudPlatform/functions-framework-conformance/blob/main/docs/mapping.md
private static $ceTypeMap = [
'google.pubsub.topic.publish' => 'google.cloud.pubsub.topic.v1.messagePublished',
'providers/cloud.pubsub/eventTypes/topic.publish' => 'google.cloud.pubsub.topic.v1.messagePublished',
Expand Down

0 comments on commit c693c8c

Please sign in to comment.