From d6ec179b41e97c3d037cba448d4cf56ad6713af3 Mon Sep 17 00:00:00 2001 From: yougotwill Date: Mon, 10 Feb 2025 17:07:55 +1100 Subject: [PATCH] fix: remove path grepping from upload production artefacts we no longer need this since we have separate jobs --- .github/workflows/build-binaries.yml | 8 ++++---- actions/upload_prod_artefacts/action.yml | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 155c31391..2eb0484ef 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -138,7 +138,7 @@ jobs: - name: Setup & Build uses: ./actions/setup_and_build with: - cache_suffix: ${{ matrix.os }}-${{ matrix.arch }} + cache_suffix: ${{ runner.os }}-${{ matrix.arch }} # we want to test on all platforms since some are testing the rendered menus (and are dependent on the platform) - name: Unit Test @@ -156,7 +156,7 @@ jobs: if: ${{ env.SHOULD_PUBLISH == 'false' }} uses: ./actions/upload_prod_artefacts with: - upload_prefix: ${{ matrix.os }}-${{ matrix.arch }} + upload_prefix: ${{ runner.os }}-${{ matrix.arch }} - name: Build & publish # we want this to run only when on "push" to "master" @@ -185,7 +185,7 @@ jobs: - name: Setup & Build uses: ./actions/setup_and_build with: - cache_suffix: ${{ matrix.os }}-${{ matrix.arch }} + cache_suffix: ${{ runner.os }}-${{ matrix.arch }} # we want to test on all platforms since some are testing the rendered menus (and are dependent on the platform) - name: Unit Test @@ -203,7 +203,7 @@ jobs: if: ${{ env.SHOULD_PUBLISH == 'false' && env.SHOULD_PUBLISH_ALPHA == 'false' }} uses: ./actions/upload_prod_artefacts with: - upload_prefix: ${{ matrix.os }}-${{ matrix.arch }} + upload_prefix: ${{ runner.os }}-${{ matrix.arch }} - name: Build & publish # we want this to run only when on "push" to "master" diff --git a/actions/upload_prod_artefacts/action.yml b/actions/upload_prod_artefacts/action.yml index 2a901b93b..2e9542f92 100644 --- a/actions/upload_prod_artefacts/action.yml +++ b/actions/upload_prod_artefacts/action.yml @@ -16,7 +16,7 @@ runs: working-directory: ./release/ - name: Remaining files - run: ls . | grep ${{ matrix.arch }} + run: ls . shell: bash working-directory: ./release/ @@ -24,7 +24,4 @@ runs: uses: actions/upload-artifact@v4 with: name: ${{ inputs.upload_prefix }}-production - path: | - release/builder-debug.yml - release/latest-mac.yml - release/**/session-desktop-mac-${{ matrix.arch }} + path: release