diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 210e989..3803e03 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,15 @@ jobs: - name: Install Python packages (Windows only) if: ${{ matrix.os }} == 'windows-latest' run: | - pip install --user datetime matplotlib monotonic natsort joblib ompython simplejson psutil + pip install --user \ + datetime \ + matplotlib \ + monotonic \ + natsort \ + joblib \ + ompython \ + simplejson \ + psutil - name: Cache pip dependencies uses: actions/cache@v4 diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts index e2f72b2..b6f7c07 100644 --- a/__tests__/main.test.ts +++ b/__tests__/main.test.ts @@ -11,6 +11,7 @@ import * as os from 'os' import * as path from 'path' import * as core from '@actions/core' import * as main from '../src/main' +import { getMSYS } from '../src/get-msys' // Some expected string const mdCoverageTable = `| Total | Frontend | Backend | SimCode | Templates | Compilation | Simulation | Verification | @@ -112,7 +113,7 @@ describe('action', () => { expect(debugMock).toHaveBeenNthCalledWith( 5, 'Running python test.py --verbose --branch=master --noclean' + - ` ${os.platform() === 'win32' ? '--msysEnvironment=ucrt64' : ''}` + + ` ${os.platform() === 'win32' ? `--msysEnvironment=${getMSYS()}` : ''}` + ` ${path.join('configs', 'conf-MyLibrary.json')}` ) expect(debugMock).toHaveBeenNthCalledWith(