diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b55a36823..25b37c460 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - v4-dev pull_request: branches: - "**" @@ -19,9 +20,9 @@ jobs: fail-fast: false matrix: node: - - "10.x" - "12.x" - "14.x" + - "16.x" os: - "ubuntu-latest" - "macos-latest" @@ -58,6 +59,6 @@ jobs: - name: Run bundlewatch run: npm run bundlewatch - if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.node, '14') + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.node, '16') env: - BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}" + BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}" \ No newline at end of file diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 840b45aeb..000000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Docs - -on: - push: - branches: - - master - pull_request: - branches: - - "**" - -env: - FORCE_COLOR: 2 - NODE: 14.x - RUBY: 2.7 - -jobs: - run: - runs-on: ubuntu-latest - - steps: - - name: Clone repository - uses: actions/checkout@v2 - - - name: Set up Node.js - uses: actions/setup-node@v2 - with: - node-version: "${{ env.NODE }}" - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: "${{ env.RUBY }}" - bundler-cache: true - working-directory: docs - - - name: Version info - run: | - ruby --version - gem --version - bundle --version - java -version - - - name: Set up npm cache - uses: actions/cache@v2 - with: - path: ~/.npm - key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}} - restore-keys: | - ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }} - ${{ runner.os }}-node-v${{ env.NODE }}- - - - name: Install npm dependencies - run: npm ci - - - name: Build docs - run: npm run docs-compile - - - name: Run HTML validator - run: npm run docs-lint diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d302b2e99..6f7d4d385 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,13 +4,14 @@ on: push: branches: - master + - v4-dev pull_request: branches: - "**" env: FORCE_COLOR: 2 - NODE: 14.x + NODE: 16.x jobs: run: @@ -38,4 +39,4 @@ jobs: run: npm ci - name: Run lint - run: npm run lint + run: npm run lint \ No newline at end of file