diff --git a/.github/workflows/e2e-full.yml b/.github/workflows/e2e-full.yml index abfe21f7cd..458b7bd2ae 100644 --- a/.github/workflows/e2e-full.yml +++ b/.github/workflows/e2e-full.yml @@ -42,7 +42,7 @@ jobs: key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }} - name: Install dependencies run: | - npm install + npm ci - name: Build run: | npm run build diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml deleted file mode 100644 index da384331de..0000000000 --- a/.github/workflows/e2e.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: E2E -on: - pull_request: - branches: - - main -jobs: - tests: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - db: ['postgres'] - node-version: ['16-alpine'] - env: - CACHED_IMAGE: ghcr.io/directus/directus-e2e-test-cache:${{ matrix.node-version }} - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '16' - - name: restore node_modules cache - uses: actions/cache@v2 - with: - path: | - node_modules - **/node_modules - key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }} - - name: Install dependencies - run: | - npm install - - name: Build - run: | - npm run build - - name: Run tests - env: - TEST_NODE_VERSION: ${{ matrix.node-version }} - TEST_DB: ${{ matrix.db }} - run: npm run test:e2e diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2911c4a036..4dd08c8aa0 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -37,7 +37,7 @@ jobs: ${{ runner.os }}- - name: Install Dependencies - run: npm install + run: npm ci - name: Run linters run: npm run lint diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 65964d7c31..708566d27e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: node: ['16'] - name: Node ${{ matrix.node }} sample + name: Node ${{ matrix.node }} steps: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@0.9.1 @@ -40,7 +40,7 @@ jobs: ${{ runner.os }}- - name: Install Dependencies - run: npm install + run: npm ci - name: Build Dependencies run: npm run build