From cf6e0f3df9182e9f7ea1b1bf8e0aacb9ba21790e Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 11 Sep 2024 15:46:49 -0600 Subject: [PATCH 1/3] fix getPreviousRelease --- .../getDeployPullRequestList/getDeployPullRequestList.ts | 2 +- .github/actions/javascript/getDeployPullRequestList/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts index b07d29a587be3..2c854b37eb20d 100644 --- a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts +++ b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts @@ -46,7 +46,7 @@ async function run() { } // If it's anywhere else in this page, the the prior release is the next item in the page - if (indexOfCurrentRelease > 0) { + if (indexOfCurrentRelease >= 0) { priorTag = filteredData.at(indexOfCurrentRelease + 1)?.tag_name; done(); } diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js index 0346df720b8ec..918d631778d3d 100644 --- a/.github/actions/javascript/getDeployPullRequestList/index.js +++ b/.github/actions/javascript/getDeployPullRequestList/index.js @@ -11535,7 +11535,7 @@ async function run() { return filteredData; } // If it's anywhere else in this page, the the prior release is the next item in the page - if (indexOfCurrentRelease > 0) { + if (indexOfCurrentRelease >= 0) { priorTag = filteredData.at(indexOfCurrentRelease + 1)?.tag_name; done(); } From c9966ec79e27d52bf670fc2b2d0a06f9bd6dddc1 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 11 Sep 2024 16:26:25 -0600 Subject: [PATCH 2/3] try fix artifacts --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 536fef1bf2208..429116b2359ed 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -407,7 +407,7 @@ jobs: - name: Upload web sourcemaps artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'web' || 'web-staging' }}-sourcemaps-artifact + name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-sourcemaps-artifact path: ./dist/merged-source-map.js.map - name: Compress web build .tar.gz and .zip @@ -418,13 +418,13 @@ jobs: - name: Upload .tar.gz web build artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'web' || 'web-staging' }}-build-tar-gz-artifact + name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-build-tar-gz-artifact path: ./webBuild.tar.gz - name: Upload .zip web build artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'web' || 'web-staging' }}-build-zip-artifact + name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-build-zip-artifact path: ./webBuild.zip postSlackMessageOnFailure: From 62c341039a249d952fa749b26297b7b2031d1bf8 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 11 Sep 2024 16:38:55 -0600 Subject: [PATCH 3/3] update more places --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 429116b2359ed..a2abe4810041b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -196,13 +196,13 @@ jobs: - name: Upload desktop sourcemaps artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'desktop-sourcemaps-artifact' || 'desktop-staging-sourcemaps-artifact' }} + name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'desktop-sourcemaps-artifact' || 'desktop-staging-sourcemaps-artifact' }} path: ./desktop/dist/www/merged-source-map.js.map - name: Upload desktop build artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'desktop-build-artifact' || 'desktop-staging-build-artifact' }} + name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'desktop-build-artifact' || 'desktop-staging-build-artifact' }} path: ./desktop-build/NewExpensify.dmg iOS: