From 6af7f942542efeb83bbc59dfed76e66c613b4176 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 24 Sep 2024 12:40:53 +1000 Subject: [PATCH] fix: plop --- .github/workflows/build-binaries.yml | 6 +++--- actions/setup_and_build/action.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 658c94a90f..e6160d4685 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -46,7 +46,7 @@ jobs: - name: Setup & Build uses: ./actions/setup_and_build with: - pkg_to_build: ${{ matrix.pkg_to_build }} + cache_suffix: ${{ matrix.pkg_to_build }} - name: Lint Files # no need to lint files on all platforms @@ -92,7 +92,7 @@ jobs: - name: Setup & Build uses: ./actions/setup_and_build with: - pkg_to_build: 'windows_x64' + cache_suffix: 'windows_x64' # we want to test on all platforms are some are testing the menus rendered (and are depent on the platform) - name: Unit Test @@ -135,7 +135,7 @@ jobs: - name: Setup & Build uses: ./actions/setup_and_build with: - pkg_to_build: 'macos_x64' + cache_suffix: 'macos_x64' # we want to test on all platforms are some are testing the menus rendered (and are depent on the platform) - name: Unit Test diff --git a/actions/setup_and_build/action.yml b/actions/setup_and_build/action.yml index c49e065524..c4494b4e02 100644 --- a/actions/setup_and_build/action.yml +++ b/actions/setup_and_build/action.yml @@ -1,7 +1,7 @@ name: 'Setup and build' description: 'Setup and build Session Desktop' inputs: - pkg_to_build: + cache_suffix: description: 'the package we are currently building (used as key for the cached node_modules)' required: true @@ -32,7 +32,7 @@ runs: id: cache-desktop-modules with: path: node_modules - key: ${{ runner.os }}-${{ runner.arch }}-${{ inputs.pkg_to_build }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} + key: ${{ runner.os }}-${{ runner.arch }}-${{ inputs.cache_suffix }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} - name: Install dependencies shell: bash @@ -44,7 +44,7 @@ runs: if: runner.os != 'Windows' with: path: node_modules - key: ${{ runner.os }}-${{ runner.arch }}-${{ inputs.pkg_to_build }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} + key: ${{ runner.os }}-${{ runner.arch }}-${{ inputs.cache_suffix }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} - name: Generate and concat files shell: bash