diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 26f7ccf91c79..5ad81f1b9541 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -47,46 +47,3 @@ jobs: env: NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}} - # Anchors still not supported :( - # https://github.community/t5/GitHub-Actions/Support-for-YAML-anchors/td-p/30336 - nightly-next: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: 'refs/heads/next' - fetch-depth: 0 # All history - - name: fetch tags - run: git fetch --depth=1 origin "+refs/tags/*:refs/tags/*" - - uses: actions/setup-node@v1 - with: - node-version: 12 - registry-url: 'https://registry.npmjs.org' - - name: install - run: yarn --check-files --frozen-lockfile --non-interactive - - name: lint - run: yarn test:lint - - name: audit - run: yarn run audit - - name: build - run: yarn test:fixtures -i - env: - NODE_OPTIONS: "--max_old_space_size=4096" - - name: lint app - run: yarn lint:app - - name: test dev - run: yarn test:dev -w=2 - - name: test unit - run: yarn test:unit - - name: test e2e - run: yarn test:e2e - - name: bump version - run: yarn lerna version --yes --no-changelog --no-git-tag-version --no-push --force-publish "*" --loglevel verbose - - name: build - run: PACKAGE_SUFFIX=edge yarn build - - name: publish - run: ./scripts/workspace-run npm publish --tag next -q - env: - NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}} - - diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 460201b09337..32ed786f6424 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,17 +5,15 @@ on: branches: - dev - 2.x - - next pull_request: branches: - dev - 2.x - - next jobs: setup: runs-on: ${{ matrix.os }} - if: github.event_name == 'push' || !((github.base_ref == '2.x' || github.base_ref == 'next') && github.head_ref == 'dev') + if: github.event_name == 'push' || !((github.base_ref == '2.x') && github.head_ref == 'dev') strategy: matrix: @@ -300,7 +298,6 @@ jobs: - name: publish run: | - if [ "$ref" = "refs/heads/next" ]; then tag="--tag next"; fi ./scripts/workspace-run npm publish $tag -q env: ref: ${{ github.ref }} diff --git a/renovate.json b/renovate.json index 8dffe7f8619a..d44970f5ae64 100644 --- a/renovate.json +++ b/renovate.json @@ -3,8 +3,7 @@ "@nuxtjs" ], "baseBranches": [ - "dev", - "next" + "dev" ], "ignoreDeps": [ "core-js",