Skip to content

Commit fc9363e

Browse files
authored
Merge pull request #66 from Snapp949/mergify/configuration-deprecated-update
2 parents 9d9f228 + 50ca4c8 commit fc9363e

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/actions/dump-ci-stats-to-gcp-metrics.cjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// Check if GCP_CREDENTIALS is set and valid before requiring the module
2+
if (!process.env.GCP_CREDENTIALS || process.env.GCP_CREDENTIALS.trim() === '') {
3+
console.log('GCP_CREDENTIALS not set. Skipping metrics upload.');
4+
process.exit(0);
5+
}
6+
17
const Monitoring = require('@google-cloud/monitoring');
28

39
const gcpCredentials = JSON.parse(process.env.GCP_CREDENTIALS);

.mergify.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ shared:
4141

4242
merge_queue:
4343
max_parallel_checks: 1
44-
queued_label: null
44+
queued_label:
4545

4646
priority_rules:
4747
- name: high_priority
@@ -56,8 +56,6 @@ queue_rules:
5656
merge_conditions: *merge-conditions
5757
merge_method: merge
5858
update_method: rebase
59-
autosquash: true
60-
6159
- name: merge
6260
commit_message_template: *commit-message-template
6361
queue_conditions: *queue-conditions
@@ -96,5 +94,4 @@ pull_request_rules:
9694
- check-failure=no-fixup-commits
9795
- -draft
9896
actions:
99-
rebase:
100-
autosquash: true
97+
rebase: {}

0 commit comments

Comments
 (0)