From 6e1c165b3181b698d53db3292ce10cda1e8d664c Mon Sep 17 00:00:00 2001 From: zomars Date: Mon, 11 Jul 2022 18:27:24 -0600 Subject: [PATCH] Removes redundant matrix for now --- .github/workflows/check-types.yml | 13 ++++--------- .github/workflows/e2e-embed.yml | 10 +++------- .github/workflows/e2e.yml | 12 ++++-------- .github/workflows/lint.yml | 14 +++++--------- 4 files changed, 16 insertions(+), 33 deletions(-) diff --git a/.github/workflows/check-types.yml b/.github/workflows/check-types.yml index 6147355fce..c120351928 100644 --- a/.github/workflows/check-types.yml +++ b/.github/workflows/check-types.yml @@ -4,16 +4,11 @@ on: branches: - main paths: - - '**.tsx?' + - "**.tsx?" jobs: check-types: name: Check types - strategy: - matrix: - node: ["16.x"] - os: [ubuntu-latest] - runs-on: ${{ matrix.os }} - + runs-on: ubuntu-latest steps: - name: Checkout repo uses: actions/checkout@v2 @@ -21,10 +16,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 2 - - name: Use Node ${{ matrix.node }} + - name: Use Node 16.x uses: actions/setup-node@v3 with: - node-version: ${{ matrix.node }} + node-version: 16.x cache: "yarn" - run: yarn --frozen-lockfile - run: yarn type-check diff --git a/.github/workflows/e2e-embed.yml b/.github/workflows/e2e-embed.yml index 14d07dfb01..e279d3f1f9 100644 --- a/.github/workflows/e2e-embed.yml +++ b/.github/workflows/e2e-embed.yml @@ -11,11 +11,7 @@ jobs: e2e-embed: timeout-minutes: 20 name: Embed and booking flow(for non-embed as well) - strategy: - matrix: - node: ["16.x"] - os: [ubuntu-latest] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest env: DATABASE_URL: postgresql://postgres:@localhost:5432/calendso @@ -66,10 +62,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} # So we can test on forks fetch-depth: 2 - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV - - name: Use Node ${{ matrix.node }} + - name: Use Node 16.x uses: actions/setup-node@v3 with: - node-version: ${{ matrix.node }} + node-version: 16.x cache: "yarn" - name: Cache playwright binaries diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index db6c256935..9906ed982d 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,12 +9,8 @@ on: jobs: e2e: timeout-minutes: 20 - name: Testing ${{ matrix.node }} and ${{ matrix.os }} - strategy: - matrix: - node: ["16.x"] - os: [ubuntu-latest] - runs-on: ${{ matrix.os }} + name: Testing 16.x and ubuntu-latest + runs-on: ubuntu-latest env: DATABASE_URL: postgresql://postgres:@localhost:5432/calendso @@ -68,10 +64,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} # So we can test on forks fetch-depth: 2 - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV - - name: Use Node ${{ matrix.node }} + - name: Use Node 16.x uses: actions/setup-node@v3 with: - node-version: ${{ matrix.node }} + node-version: 16.x cache: "yarn" - name: Cache playwright binaries diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c2310c11ca..907b9cfe56 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,15 +4,11 @@ on: branches: - main paths: - - '**.tsx?' - - '**.jsx?' + - "**.tsx?" + - "**.jsx?" jobs: lint: - strategy: - matrix: - node: ["16.x"] - os: [ubuntu-latest] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - name: Checkout repo @@ -21,10 +17,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 2 - - name: Use Node ${{ matrix.node }} + - name: Use Node 16.x uses: actions/setup-node@v3 with: - node-version: ${{ matrix.node }} + node-version: 16.x cache: "yarn" - name: Install deps