From 1da5a75c1411bdfece2b60f83095082f6ce68ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Jacobi?= Date: Tue, 19 Dec 2023 14:26:28 -0300 Subject: [PATCH] Fix publishing artifacts to gh release Change-type: patch --- .github/actions/publish/action.yml | 7 ++++--- .github/actions/test/action.yml | 2 +- .../{@oclif+core+3.14.1.patch => @oclif+core+3.15.0.patch} | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) rename patches/all/{@oclif+core+3.14.1.patch => @oclif+core+3.15.0.patch} (96%) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 19c56779..3d158f34 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -28,7 +28,7 @@ runs: using: 'composite' steps: - name: Download custom source artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }} path: ${{ runner.temp }} @@ -127,8 +127,9 @@ runs: XCODE_APP_LOADER_TEAM_ID: ${{ inputs.XCODE_APP_LOADER_TEAM_ID }} - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4 with: - name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }} + name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ strategy.job-index }} path: dist retention-days: 1 + if-no-files-found: error diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 7d289fd2..633de835 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -58,7 +58,7 @@ runs: run: tar --exclude-vcs -acf ${{ runner.temp }}/custom.tgz . - name: Upload custom artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4 with: name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }} path: ${{ runner.temp }}/custom.tgz diff --git a/patches/all/@oclif+core+3.14.1.patch b/patches/all/@oclif+core+3.15.0.patch similarity index 96% rename from patches/all/@oclif+core+3.14.1.patch rename to patches/all/@oclif+core+3.15.0.patch index db7fb1c1..a36c07cb 100644 --- a/patches/all/@oclif+core+3.14.1.patch +++ b/patches/all/@oclif+core+3.15.0.patch @@ -12,10 +12,10 @@ index 607d8dc..07ba1f2 100644 return lines.join('\n'); } diff --git a/node_modules/@oclif/core/lib/help/command.js b/node_modules/@oclif/core/lib/help/command.js -index 82d9eed..0a8d45f 100644 +index 0753040..c1b0f67 100644 --- a/node_modules/@oclif/core/lib/help/command.js +++ b/node_modules/@oclif/core/lib/help/command.js -@@ -48,7 +48,7 @@ class CommandHelp extends formatter_1.HelpFormatter { +@@ -58,7 +58,7 @@ class CommandHelp extends formatter_1.HelpFormatter { if (args.filter((a) => a.description).length === 0) return; return args.map((a) => { @@ -24,7 +24,7 @@ index 82d9eed..0a8d45f 100644 let description = a.description || ''; if (a.default) description = `${(0, theme_1.colorize)(this.config?.theme?.flagDefaultValue, `[default: ${a.default}]`)} ${description}`; -@@ -143,14 +143,12 @@ class CommandHelp extends formatter_1.HelpFormatter { +@@ -153,14 +153,12 @@ class CommandHelp extends formatter_1.HelpFormatter { label = labels.join((0, theme_1.colorize)(this.config?.theme?.flagSeparator, flag.char ? ', ' : ' ')); } if (flag.type === 'option') {