From 343fcf37fda94b777f1797f946d47d155f5b2627 Mon Sep 17 00:00:00 2001 From: Cody Baker Date: Wed, 29 May 2024 22:37:50 -0400 Subject: [PATCH 1/5] restore windows --- .github/workflows/example_data_cache.yml | 2 +- .github/workflows/testing_dev.yml | 4 ++-- .github/workflows/testing_dev_with_live_services.yml | 4 ++-- .github/workflows/testing_pipelines.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) 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_dev.yml b/.github/workflows/testing_dev.yml index 72bd3d244..82b99f1b0 100644 --- a/.github/workflows/testing_dev.yml +++ b/.github/workflows/testing_dev.yml @@ -29,8 +29,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: - uses: actions/checkout@v4 diff --git a/.github/workflows/testing_dev_with_live_services.yml b/.github/workflows/testing_dev_with_live_services.yml index 1d4be248d..f8bdffe3b 100644 --- a/.github/workflows/testing_dev_with_live_services.yml +++ b/.github/workflows/testing_dev_with_live_services.yml @@ -31,8 +31,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: - uses: actions/checkout@v4 diff --git a/.github/workflows/testing_pipelines.yml b/.github/workflows/testing_pipelines.yml index 1a4ca41d6..ca5f7c3c8 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: From 6376765d9217e7c78450b134b0c411acf7c1b5fd Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Thu, 30 May 2024 08:44:47 -0700 Subject: [PATCH 2/5] Provide env variable using Github Actions directly --- .github/workflows/testing_pipelines.yml | 25 +++++-------------------- tests/e2e/pipelines.test.ts | 2 +- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/testing_pipelines.yml b/.github/workflows/testing_pipelines.yml index ca5f7c3c8..bbdc4747a 100644 --- a/.github/workflows/testing_pipelines.yml +++ b/.github/workflows/testing_pipelines.yml @@ -94,34 +94,19 @@ jobs: with: 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 From 69bbe9a4ec6a1662613c188d5efd1f6da7638417 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 15:45:03 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/testing_pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing_pipelines.yml b/.github/workflows/testing_pipelines.yml index bbdc4747a..d2eb48e9d 100644 --- a/.github/workflows/testing_pipelines.yml +++ b/.github/workflows/testing_pipelines.yml @@ -94,7 +94,7 @@ jobs: with: path: ./behavior_testing_data key: behavior-datasets-${{ matrix.os }}-${{ steps.behavior.outputs.HASH_behavior_DATASET }} - + # Run pipeline tests - if: matrix.os != 'ubuntu-latest' name: Run tests From 3c40850be28adf5117f4f2a30392d7fb3dfeb7b4 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Thu, 30 May 2024 12:28:47 -0400 Subject: [PATCH 4/5] Update testing_dev.yml --- .github/workflows/testing_dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing_dev.yml b/.github/workflows/testing_dev.yml index 82b99f1b0..72bd3d244 100644 --- a/.github/workflows/testing_dev.yml +++ b/.github/workflows/testing_dev.yml @@ -29,8 +29,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: - uses: actions/checkout@v4 From 1f847bc0cb45324b731b24a6a7d9ab2819cee462 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Thu, 30 May 2024 12:43:34 -0400 Subject: [PATCH 5/5] Update testing_dev_with_live_services.yml --- .github/workflows/testing_dev_with_live_services.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing_dev_with_live_services.yml b/.github/workflows/testing_dev_with_live_services.yml index f8bdffe3b..1d4be248d 100644 --- a/.github/workflows/testing_dev_with_live_services.yml +++ b/.github/workflows/testing_dev_with_live_services.yml @@ -31,8 +31,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: - uses: actions/checkout@v4