diff --git a/.github/workflows/check-test.yaml b/.github/workflows/check-test.yaml deleted file mode 100644 index 240b6bb85d0..00000000000 --- a/.github/workflows/check-test.yaml +++ /dev/null @@ -1,90 +0,0 @@ -# This action runs lint checks and tests against the code. -name: Check and Test - -# Controls when the action will run. -on: - pull_request: - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -env: - MAIN_BRANCH_NAME: remotes/origin/main - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - check-and-test: - name: Check and Test - - timeout-minutes: 60 - - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - - fail-fast: false - - # The type of runner that the job will run on - runs-on: ${{ matrix.os }} - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - name: Install Deps Ubuntu - if: ${{ runner.os == 'Linux' }} - run: sudo apt-get -y install libkrb5-dev libsecret-1-dev net-tools libstdc++6 gnome-keyring - - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Setup Node.js Environment - uses: actions/setup-node@v2 - with: - # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 - node-version: ^14.17.5 - cache: 'npm' - - - name: Install npm@8.3.1 - run: | - npm install -g npm@8.3.1 - - - name: Run node-gyp bug workaround script - run: | - bash .evergreen/node-gyp-bug-workaround.sh - - - name: Install Dependencies - run: | - npm -v - npm ci - # Dependencies are included when installing as npm workspaces will - # hoist every package in the repo and it's important that the - # dependencies of packages we are planning to test are also prepared - npx lerna run bootstrap --stream --since $MAIN_BRANCH_NAME --include-dependencies - shell: bash - - - name: Run Checks - # We exclude dependents when running eslint and depchecks because - # linting and dependency checking is relevant only for packages where - # the source code was changed - run: npm run check-ci -- --stream --since $MAIN_BRANCH_NAME --exclude-dependents - shell: bash - - - name: Run Tests - env: - E2E_TESTS_ATLAS_HOST: ${{ secrets.E2E_TESTS_ATLAS_HOST }} - E2E_TESTS_DATA_LAKE_HOST: ${{ secrets.E2E_TESTS_DATA_LAKE_HOST }} - E2E_TESTS_ANALYTICS_NODE_HOST: ${{ secrets.E2E_TESTS_ANALYTICS_NODE_HOST }} - E2E_TESTS_SERVERLESS_HOST: ${{ secrets.E2E_TESTS_SERVERLESS_HOST }} - E2E_TESTS_FREE_TIER_HOST: ${{ secrets.E2E_TESTS_FREE_TIER_HOST }} - E2E_TESTS_ATLAS_USERNAME: ${{ secrets.E2E_TESTS_ATLAS_USERNAME }} - E2E_TESTS_ATLAS_PASSWORD: ${{ secrets.E2E_TESTS_ATLAS_PASSWORD }} - E2E_TESTS_ATLAS_X509_PEM: ${{ secrets.E2E_TESTS_ATLAS_X509_PEM }} - # Matches what we are doing in Evergreen - MONGODB_VERSION: '4' - # compass-e2e-tests are ignored as we are already running tests against - # a packaged application in a separate workflow, so running them here - # slows down things while testing the same thing - run: npm run test-ci -- --stream --since $MAIN_BRANCH_NAME --ignore compass-e2e-tests - shell: bash diff --git a/.github/workflows/connectivity-tests.yaml b/.github/workflows/connectivity-tests.yaml index 1d9c3acc756..50aa93123b6 100644 --- a/.github/workflows/connectivity-tests.yaml +++ b/.github/workflows/connectivity-tests.yaml @@ -110,5 +110,5 @@ jobs: E2E_TESTS_ATLAS_X509_PEM: ${{ secrets.E2E_TESTS_ATLAS_X509_PEM }} # Matches what we are doing in Evergreen MONGODB_VERSION: '4' - run: COMPASS_RUN_DOCKER_TESTS=true npm run test --workspace mongodb-data-service + run: COMPASS_RUN_DOCKER_TESTS=true npm run test-connectivity --workspace mongodb-data-service shell: bash diff --git a/.github/workflows/build.yaml b/.github/workflows/e2e-tests-osx.yaml similarity index 81% rename from .github/workflows/build.yaml rename to .github/workflows/e2e-tests-osx.yaml index 4083ab4b815..aada8b3c3ff 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/e2e-tests-osx.yaml @@ -1,23 +1,24 @@ -# This action runs lint checks and tests against the code. -name: Build Compass +# Run e2e tests on osx since in EVG are currently disabled due +# to issues with unlocking keytar. +name: E2e Tests OSX -# Controls when the action will run. on: pull_request: - - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + push: + branches: + - main # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - build: - name: Build Compass + build-and-test: + name: Package and Run E2e Tests on OSX timeout-minutes: 45 strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [macos-latest] fail-fast: false @@ -26,10 +27,6 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Install Deps Ubuntu - if: ${{ runner.os == 'Linux' }} - run: sudo apt-get -y install libkrb5-dev libsecret-1-dev net-tools libstdc++6 gnome-keyring - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout uses: actions/checkout@v2 @@ -64,12 +61,6 @@ jobs: # We don't need to bootstrap anything else before running the e2e tests npx lerna run bootstrap -- --stream --scope @mongodb/webpack-config-compass - # https://github.community/t/set-path-for-wix-toolset-in-windows-runner/154708/3 - - name: Set path for candle.exe and light.exe - if: ${{ runner.os == 'Windows' }} - run: echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH - shell: bash - - name: Build Compass env: DEBUG: 'hadron*,mongo*,electron*' @@ -114,4 +105,4 @@ jobs: if: always() with: name: Webdriverio Debug Files ${{ github.workflow }} ${{ runner.os }} - path: packages/compass-e2e-tests/.log/**/* + path: packages/compass-e2e-tests/.log/**/* \ No newline at end of file