From feaaa4ed8dec9cce60241388a0f043b82b54a3ee Mon Sep 17 00:00:00 2001 From: Johnny Hausman Date: Tue, 20 Jan 2026 12:20:28 -0600 Subject: [PATCH] [wip] return pr-merge-release back to normal. --- .editorconfig | 15 +++++++++++++++ .github/workflows/pr-merge-release.yml | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f25695d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +root = true + +[*] +indent_style = space +indent_size = 3 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[*.{yml,yaml}] +indent_size = 2 diff --git a/.github/workflows/pr-merge-release.yml b/.github/workflows/pr-merge-release.yml index d576d00..f692cbf 100644 --- a/.github/workflows/pr-merge-release.yml +++ b/.github/workflows/pr-merge-release.yml @@ -17,8 +17,10 @@ jobs: # Only run if the PR closed by merging and we have a label if: ${{ needs.call-get-label.outputs.valid == 'true' }} uses: ./.github/workflows/e2e-test.yml + with: + app_id: ${{ vars.GS_DEV_APP_ID }} secrets: - app_id: ${{ secrets.GS_DEV_APP_ID }} + # app_id: ${{ secrets.GS_DEV_APP_ID }} app_secret: ${{ secrets.GS_DEV_APP_PK }} call-bump-version: name: Version