From 37a11b61c22e30628e77ab31d20b3261698b23f1 Mon Sep 17 00:00:00 2001 From: Sean Budd Date: Tue, 16 Jun 2026 16:16:51 +1000 Subject: [PATCH 1/3] Handle modifications of existing add-on versions better --- .github/workflows/checkAndSubmitAddonMetadata.yml | 7 +++++++ .github/workflows/checkFilesChanged.js | 15 ++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/checkAndSubmitAddonMetadata.yml b/.github/workflows/checkAndSubmitAddonMetadata.yml index 3978200e0ad..b83c9df509d 100644 --- a/.github/workflows/checkAndSubmitAddonMetadata.yml +++ b/.github/workflows/checkAndSubmitAddonMetadata.yml @@ -55,6 +55,13 @@ jobs: const url = "GET /repos/" + process.env.GITHUB_REPOSITORY + "/compare/master..." + "${{ env.branchName }}" const result = await github.request(url) return getAddonFilename(result.data.files) + - name: Handle error in get add-on file name + if: ${{ failure() && steps.getAddonFileName.outcome == 'failure' }} + env: + GH_TOKEN: ${{ github.token }} + run: | + gh issue comment "${{ inputs.issueNumber }}" --body-file ./validationErrors.md + gh issue close "${{ inputs.issueNumber }}" --reason "not planned" - name: Determine add-on ID uses: actions/github-script@v7 id: getAddonId diff --git a/.github/workflows/checkFilesChanged.js b/.github/workflows/checkFilesChanged.js index a59a3403751..0b6180a3006 100644 --- a/.github/workflows/checkFilesChanged.js +++ b/.github/workflows/checkFilesChanged.js @@ -1,5 +1,5 @@ module.exports = getAddonFileName -const fs = require('fs') +const fs = require("fs") function getAddonFileName(changedFiles) { var addonFileName @@ -8,21 +8,18 @@ function getAddonFileName(changedFiles) { var errMsg if (filename.startsWith("addons")) { if (Boolean(addonFileName)){ - errMsg = "Please submit addon releases individually. One file at a time." - fs.writeFileSync('./validationErrors.md', errMsg) - throw errMsg + throw "Multiple add-on files updated." } if (fileData.status != "added") { - errMsg = "Modifications to submitted add-ons will not be auto-approved" - fs.writeFileSync('./validationErrors.md', errMsg) + errMsg = "This is a modification of a previously submitted add-on version. Please submit a new add-on version instead of modifying an existing one." + // Ensure an error message is passed on to the user when this happens. + fs.writeFileSync("./validationErrors.md", errMsg) throw errMsg } addonFileName = filename } else { - errMsg = "Non-addon-submission files updated. This will not be auto-approved." - fs.writeFileSync('./validationErrors.md', errMsg) - throw errMsg + throw "Non-addon-submission files updated." } } return addonFileName From f94e70f158d643267d874aebdc94dc1254702e19 Mon Sep 17 00:00:00 2001 From: Sean Budd Date: Tue, 16 Jun 2026 16:24:29 +1000 Subject: [PATCH 2/3] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sean Budd --- .github/workflows/checkAndSubmitAddonMetadata.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checkAndSubmitAddonMetadata.yml b/.github/workflows/checkAndSubmitAddonMetadata.yml index b83c9df509d..561c81f6379 100644 --- a/.github/workflows/checkAndSubmitAddonMetadata.yml +++ b/.github/workflows/checkAndSubmitAddonMetadata.yml @@ -60,7 +60,11 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - gh issue comment "${{ inputs.issueNumber }}" --body-file ./validationErrors.md + if (Test-Path "./validationErrors.md") { + gh issue comment "${{ inputs.issueNumber }}" --body-file ./validationErrors.md + } else { + gh issue comment "${{ inputs.issueNumber }}" --body "Submission validation failed before an error message file could be generated. Please check the workflow logs for details." + } gh issue close "${{ inputs.issueNumber }}" --reason "not planned" - name: Determine add-on ID uses: actions/github-script@v7 From 44337dfb4f9113ca5ff21fd41c351bf02e8f7135 Mon Sep 17 00:00:00 2001 From: Sean Budd Date: Tue, 16 Jun 2026 16:26:29 +1000 Subject: [PATCH 3/3] Apply suggestion from @seanbudd Signed-off-by: Sean Budd --- .github/workflows/checkAndSubmitAddonMetadata.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checkAndSubmitAddonMetadata.yml b/.github/workflows/checkAndSubmitAddonMetadata.yml index 561c81f6379..e740b4a379c 100644 --- a/.github/workflows/checkAndSubmitAddonMetadata.yml +++ b/.github/workflows/checkAndSubmitAddonMetadata.yml @@ -62,10 +62,10 @@ jobs: run: | if (Test-Path "./validationErrors.md") { gh issue comment "${{ inputs.issueNumber }}" --body-file ./validationErrors.md + gh issue close "${{ inputs.issueNumber }}" --reason "not planned" } else { - gh issue comment "${{ inputs.issueNumber }}" --body "Submission validation failed before an error message file could be generated. Please check the workflow logs for details." + gh issue comment "${{ inputs.issueNumber }}" --body "Submission validation failed unexpectedly. Please wait for a staff member to respond. This may take up to 2 weeks." } - gh issue close "${{ inputs.issueNumber }}" --reason "not planned" - name: Determine add-on ID uses: actions/github-script@v7 id: getAddonId