diff --git a/.github/workflows/example_data_cache.yml b/.github/workflows/example_data_cache.yml index e27070078..5a2b6d9b8 100644 --- a/.github/workflows/example_data_cache.yml +++ b/.github/workflows/example_data_cache.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: python-version: ["3.12"] - os: [ubuntu-latest, macos-latest, macos-13] #, windows-latest] + os: [ubuntu-latest, macos-latest, macos-13, windows-latest] steps: diff --git a/.github/workflows/testing_pipelines.yml b/.github/workflows/testing_pipelines.yml index 1a4ca41d6..d2eb48e9d 100644 --- a/.github/workflows/testing_pipelines.yml +++ b/.github/workflows/testing_pipelines.yml @@ -26,8 +26,8 @@ jobs: - os: macos-13 # Mac x64 runner label: environments/environment-MAC-intel.yml -# - os: windows-latest -# label: environments/environment-Windows.yml + - os: windows-latest + label: environments/environment-Windows.yml steps: @@ -95,33 +95,18 @@ jobs: path: ./behavior_testing_data key: behavior-datasets-${{ matrix.os }}-${{ steps.behavior.outputs.HASH_behavior_DATASET }} - - name: Save working directory to environment file - run: echo "GIN_DATA_DIR=$(pwd)" >> .env - if: runner.os != 'Windows' - - - name: Save working directory to environment file (Windows) - run: echo GIN_DATA_DIR=%cd% >> .env - shell: bash - if: runner.os == 'Windows' - - # Display environment file for debugging - - name: Print environment file - run: cat .env - if: runner.os != 'Windows' - - - name: Print environment file - run: type .env - shell: bash - if: runner.os == 'Windows' - # Run pipeline tests - if: matrix.os != 'ubuntu-latest' name: Run tests run: npm run test:pipelines + env: + GIN_DATA_DIRECTORY: ${{ github.workspace }} - if: matrix.os == 'ubuntu-latest' name: Run tests with xvfb run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:pipelines + env: + GIN_DATA_DIRECTORY: ${{ github.workspace }} - name: Archive Pipeline Test Screenshots if: always() diff --git a/tests/e2e/pipelines.test.ts b/tests/e2e/pipelines.test.ts index 3c0f41ea8..c775916bc 100644 --- a/tests/e2e/pipelines.test.ts +++ b/tests/e2e/pipelines.test.ts @@ -15,7 +15,7 @@ import { sleep } from '../puppeteer'; // NOTE: We assume the user has put the GIN data in ~/NWB_GUIDE/test-data/GIN -const testGINPath = process.env.GIN_DATA_DIR ?? join(homedir(), paths.root, 'test-data', 'GIN') +const testGINPath = process.env.GIN_DATA_DIRECTORY ?? join(homedir(), paths.root, 'test-data', 'GIN') console.log('Using test GIN data at:', testGINPath) const pipelineDescribeFn = existsSync(testGINPath) ? describe : describe.skip