From 3cb73a2155130514496d9d593fc58975beac10c9 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Thu, 17 Apr 2025 15:56:57 -0500 Subject: [PATCH 1/3] chore: enable wireit v2 --- .github/workflows/nut.yml | 4 ++-- .github/workflows/unitTestsLinux.yml | 4 ++-- .github/workflows/unitTestsWindows.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nut.yml b/.github/workflows/nut.yml index c1a0ad2..f471fba 100644 --- a/.github/workflows/nut.yml +++ b/.github/workflows/nut.yml @@ -65,8 +65,8 @@ jobs: - uses: actions/checkout@v4 - # - uses: google/wireit@setup-github-actions-caching/v2 - # continue-on-error: true + - uses: google/wireit@setup-github-actions-caching/v2 + continue-on-error: true - uses: actions/setup-node@v4 with: diff --git a/.github/workflows/unitTestsLinux.yml b/.github/workflows/unitTestsLinux.yml index 9d5ccec..56f447c 100644 --- a/.github/workflows/unitTestsLinux.yml +++ b/.github/workflows/unitTestsLinux.yml @@ -38,8 +38,8 @@ jobs: node-version: ${{ matrix.node_version }} cache: yarn - # - uses: google/wireit@setup-github-actions-caching/v2 - # continue-on-error: true + - uses: google/wireit@setup-github-actions-caching/v2 + continue-on-error: true - name: Cache node modules id: cache-nodemodules diff --git a/.github/workflows/unitTestsWindows.yml b/.github/workflows/unitTestsWindows.yml index 6ae3f7c..674b13b 100644 --- a/.github/workflows/unitTestsWindows.yml +++ b/.github/workflows/unitTestsWindows.yml @@ -25,8 +25,8 @@ jobs: - uses: actions/checkout@v4 - # - uses: google/wireit@setup-github-actions-caching/v2 - # continue-on-error: true + - uses: google/wireit@setup-github-actions-caching/v2 + continue-on-error: true - uses: actions/setup-node@v4 with: From 3f0e22e61f9a7a4fd9c5e9c220adaab575662e21 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 18 Apr 2025 15:38:45 -0500 Subject: [PATCH 2/3] chore: install latest wireit --- .github/workflows/nut.yml | 3 +++ .github/workflows/unitTestsLinux.yml | 3 +++ .github/workflows/unitTestsWindows.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/nut.yml b/.github/workflows/nut.yml index f471fba..d140664 100644 --- a/.github/workflows/nut.yml +++ b/.github/workflows/nut.yml @@ -91,6 +91,9 @@ jobs: - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main if: ${{ steps.cache-nodemodules.outputs.cache-hit != 'true' }} + - name: Install newest wireit + run: yarn add wireit@latest + - run: yarn compile - name: Check that oclif config exists diff --git a/.github/workflows/unitTestsLinux.yml b/.github/workflows/unitTestsLinux.yml index 56f447c..35772f1 100644 --- a/.github/workflows/unitTestsLinux.yml +++ b/.github/workflows/unitTestsLinux.yml @@ -53,6 +53,9 @@ jobs: - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main if: ${{ steps.cache-nodemodules.outputs.cache-hit != 'true' }} + - name: Install newest wireit + run: yarn add wireit@latest + - run: yarn build - name: yarn test diff --git a/.github/workflows/unitTestsWindows.yml b/.github/workflows/unitTestsWindows.yml index 674b13b..2654fe8 100644 --- a/.github/workflows/unitTestsWindows.yml +++ b/.github/workflows/unitTestsWindows.yml @@ -45,6 +45,9 @@ jobs: - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main if: ${{ steps.cache-nodemodules.outputs.cache-hit != 'true' }} + - name: Install newest wireit + run: yarn add wireit@latest + - run: yarn build - name: yarn test From a8e29d00148b7238194d6ef11876694ae3afc859 Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Mon, 21 Apr 2025 11:44:08 -0500 Subject: [PATCH 3/3] chore: add note --- .github/workflows/nut.yml | 7 +++++-- .github/workflows/unitTestsLinux.yml | 7 +++++-- .github/workflows/unitTestsWindows.yml | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nut.yml b/.github/workflows/nut.yml index d140664..cfe837a 100644 --- a/.github/workflows/nut.yml +++ b/.github/workflows/nut.yml @@ -91,8 +91,11 @@ jobs: - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main if: ${{ steps.cache-nodemodules.outputs.cache-hit != 'true' }} - - name: Install newest wireit - run: yarn add wireit@latest + # This is a temporary workaround to ensure wireit is >= 0.14.12 + # Once all plugins/libs that use this workflow are updated, this can be removed + # See: https://github.com/google/wireit/issues/1297#issuecomment-2794737569 + - name: Install wireit + run: yarn add wireit@^0.14.12 - run: yarn compile diff --git a/.github/workflows/unitTestsLinux.yml b/.github/workflows/unitTestsLinux.yml index 35772f1..169818f 100644 --- a/.github/workflows/unitTestsLinux.yml +++ b/.github/workflows/unitTestsLinux.yml @@ -53,8 +53,11 @@ jobs: - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main if: ${{ steps.cache-nodemodules.outputs.cache-hit != 'true' }} - - name: Install newest wireit - run: yarn add wireit@latest + # This is a temporary workaround to ensure wireit is >= 0.14.12 + # Once all plugins/libraries that use this workflow are updated, this can be removed + # See: https://github.com/google/wireit/issues/1297#issuecomment-2794737569 + - name: Install wireit + run: yarn add wireit@^0.14.12 - run: yarn build diff --git a/.github/workflows/unitTestsWindows.yml b/.github/workflows/unitTestsWindows.yml index 2654fe8..4021897 100644 --- a/.github/workflows/unitTestsWindows.yml +++ b/.github/workflows/unitTestsWindows.yml @@ -45,8 +45,11 @@ jobs: - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main if: ${{ steps.cache-nodemodules.outputs.cache-hit != 'true' }} - - name: Install newest wireit - run: yarn add wireit@latest + # This is a temporary workaround to ensure wireit is >= 0.14.12 + # Once all plugins/libraries that use this workflow are updated, this can be removed + # See: https://github.com/google/wireit/issues/1297#issuecomment-2794737569 + - name: Install wireit + run: yarn add wireit@^0.14.12 - run: yarn build