From 6376765d9217e7c78450b134b0c411acf7c1b5fd Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Thu, 30 May 2024 08:44:47 -0700 Subject: [PATCH] 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