From 3d8df728781ea463558529f5587f9751fed3225a Mon Sep 17 00:00:00 2001 From: Daniel Young Lee Date: Tue, 24 Oct 2023 10:23:36 -0700 Subject: [PATCH 1/4] chore: Fix release script. --- .github/workflows/release.yaml | 14 ++++++++++++-- example/functions/main.py | 3 ++- samples/basic_alerts/functions/main.py | 4 ++-- samples/basic_firestore/firestore.indexes.json | 4 ++++ samples/basic_firestore/firestore.rules | 8 ++++++++ src/firebase_functions/__init__.py | 2 +- 6 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 samples/basic_firestore/firestore.indexes.json create mode 100644 samples/basic_firestore/firestore.rules diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b1b267e..a25aca4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -64,8 +64,18 @@ jobs: name: dist path: dist/ - publish_release: + publish_check: needs: stage_release + steps: + - name: Check publish conditions + id: publish-checks + run: | + echo "should_run=true" >> $GITHUB_OUTPUT + + + + publish_release: + needs: publish_check # Check whether the release should be published. We publish only when the trigger PR is # 1. merged @@ -74,7 +84,7 @@ jobs: # 4. the title prefix 'chore: Release '. if: > github.event.pull_request.merged && - github.ref == 'main' && + github.ref == 'refs/heads/master' && contains(github.event.pull_request.labels.*.name, 'release:publish') && startsWith(github.event.pull_request.title, 'chore: Release ') diff --git a/example/functions/main.py b/example/functions/main.py index 5ac35f3..c53194d 100644 --- a/example/functions/main.py +++ b/example/functions/main.py @@ -31,7 +31,8 @@ def oncallexample(req: https_fn.CallableRequest): return "Hello from https on call function example" -@pubsub_fn.on_message_published(topic="hello",) +@pubsub_fn.on_message_published( + topic="hello",) def onmessagepublishedexample( event: pubsub_fn.CloudEvent[pubsub_fn.MessagePublishedData]) -> None: print("Hello from pubsub event:", event) diff --git a/samples/basic_alerts/functions/main.py b/samples/basic_alerts/functions/main.py index 49aaf88..6b0912e 100644 --- a/samples/basic_alerts/functions/main.py +++ b/samples/basic_alerts/functions/main.py @@ -7,8 +7,8 @@ from firebase_functions.alerts import performance_fn -@alerts_fn.on_alert_published( - alert_type=alerts_fn.AlertType.BILLING_PLAN_UPDATE) +@alerts_fn.on_alert_published(alert_type=alerts_fn.AlertType.BILLING_PLAN_UPDATE + ) def onalertpublished( alert: alerts_fn.AlertEvent[alerts_fn.FirebaseAlertData[ billing_fn.PlanUpdatePayload]] diff --git a/samples/basic_firestore/firestore.indexes.json b/samples/basic_firestore/firestore.indexes.json new file mode 100644 index 0000000..415027e --- /dev/null +++ b/samples/basic_firestore/firestore.indexes.json @@ -0,0 +1,4 @@ +{ + "indexes": [], + "fieldOverrides": [] +} diff --git a/samples/basic_firestore/firestore.rules b/samples/basic_firestore/firestore.rules new file mode 100644 index 0000000..c38e3ae --- /dev/null +++ b/samples/basic_firestore/firestore.rules @@ -0,0 +1,8 @@ +rules_version = '2'; +service cloud.firestore { + match /databases/{database}/documents { + match /{document=**} { + allow read, write: if false; + } + } +} \ No newline at end of file diff --git a/src/firebase_functions/__init__.py b/src/firebase_functions/__init__.py index 4d1fab3..5935ac7 100644 --- a/src/firebase_functions/__init__.py +++ b/src/firebase_functions/__init__.py @@ -15,4 +15,4 @@ Firebase Functions for Python. """ -__version__ = "0.1.2" +__version__ = "0.1.1" From 4875f9427010cd2bc8bda0184a0c46af881d03e7 Mon Sep 17 00:00:00 2001 From: Daniel Young Lee Date: Tue, 24 Oct 2023 10:27:35 -0700 Subject: [PATCH 2/4] Revert bad commits. --- example/functions/main.py | 3 +-- samples/basic_alerts/functions/main.py | 4 ++-- samples/basic_firestore/firestore.indexes.json | 4 ---- samples/basic_firestore/firestore.rules | 8 -------- 4 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 samples/basic_firestore/firestore.indexes.json delete mode 100644 samples/basic_firestore/firestore.rules diff --git a/example/functions/main.py b/example/functions/main.py index c53194d..5ac35f3 100644 --- a/example/functions/main.py +++ b/example/functions/main.py @@ -31,8 +31,7 @@ def oncallexample(req: https_fn.CallableRequest): return "Hello from https on call function example" -@pubsub_fn.on_message_published( - topic="hello",) +@pubsub_fn.on_message_published(topic="hello",) def onmessagepublishedexample( event: pubsub_fn.CloudEvent[pubsub_fn.MessagePublishedData]) -> None: print("Hello from pubsub event:", event) diff --git a/samples/basic_alerts/functions/main.py b/samples/basic_alerts/functions/main.py index 6b0912e..49aaf88 100644 --- a/samples/basic_alerts/functions/main.py +++ b/samples/basic_alerts/functions/main.py @@ -7,8 +7,8 @@ from firebase_functions.alerts import performance_fn -@alerts_fn.on_alert_published(alert_type=alerts_fn.AlertType.BILLING_PLAN_UPDATE - ) +@alerts_fn.on_alert_published( + alert_type=alerts_fn.AlertType.BILLING_PLAN_UPDATE) def onalertpublished( alert: alerts_fn.AlertEvent[alerts_fn.FirebaseAlertData[ billing_fn.PlanUpdatePayload]] diff --git a/samples/basic_firestore/firestore.indexes.json b/samples/basic_firestore/firestore.indexes.json deleted file mode 100644 index 415027e..0000000 --- a/samples/basic_firestore/firestore.indexes.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "indexes": [], - "fieldOverrides": [] -} diff --git a/samples/basic_firestore/firestore.rules b/samples/basic_firestore/firestore.rules deleted file mode 100644 index c38e3ae..0000000 --- a/samples/basic_firestore/firestore.rules +++ /dev/null @@ -1,8 +0,0 @@ -rules_version = '2'; -service cloud.firestore { - match /databases/{database}/documents { - match /{document=**} { - allow read, write: if false; - } - } -} \ No newline at end of file From dad37453ffafd0db0b5e728519ac2562ab457848 Mon Sep 17 00:00:00 2001 From: Daniel Young Lee Date: Tue, 24 Oct 2023 10:28:16 -0700 Subject: [PATCH 3/4] Remove unused step. --- .github/workflows/release.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a25aca4..48a5f18 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -64,18 +64,8 @@ jobs: name: dist path: dist/ - publish_check: - needs: stage_release - steps: - - name: Check publish conditions - id: publish-checks - run: | - echo "should_run=true" >> $GITHUB_OUTPUT - - - publish_release: - needs: publish_check + needs: stage_release # Check whether the release should be published. We publish only when the trigger PR is # 1. merged From 2bd5046fde933ea4a1d2a4b6e4e0a856fdd5c7bc Mon Sep 17 00:00:00 2001 From: Daniel Young Lee Date: Tue, 24 Oct 2023 10:42:55 -0700 Subject: [PATCH 4/4] Not master. Main. --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 48a5f18..269420a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -74,7 +74,7 @@ jobs: # 4. the title prefix 'chore: Release '. if: > github.event.pull_request.merged && - github.ref == 'refs/heads/master' && + github.ref == 'refs/heads/main' && contains(github.event.pull_request.labels.*.name, 'release:publish') && startsWith(github.event.pull_request.title, 'chore: Release ')