ci: update test branch condition

This commit is contained in:
Daniel Roe 2023-01-19 15:03:28 +00:00
parent ca8f9b8f74
commit 331a2d724e
2 changed files with 7 additions and 8 deletions

View File

@ -3,11 +3,11 @@ name: test
on: on:
push: push:
branches: branches:
- dev - 2.x-dev
- 2.x - 2.x
pull_request: pull_request:
branches: branches:
- dev - 2.x-dev
- 2.x - 2.x
jobs: jobs:
@ -319,7 +319,7 @@ jobs:
- name: checkout - name: checkout
uses: actions/checkout@master uses: actions/checkout@master
with: with:
ref: 'refs/heads/dev' ref: "refs/heads/dev"
fetch-depth: 0 # All history fetch-depth: 0 # All history
- name: fetch tags - name: fetch tags
@ -338,7 +338,7 @@ jobs:
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: ${{ matrix.node }} node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org' registry-url: "https://registry.npmjs.org"
- name: bump version - name: bump version
run: yarn lerna version --yes --no-changelog --no-git-tag-version --no-push --force-publish "*" --loglevel verbose run: yarn lerna version --yes --no-changelog --no-git-tag-version --no-push --force-publish "*" --loglevel verbose

View File

@ -3,11 +3,11 @@ name: windows
on: on:
push: push:
branches: branches:
- dev - 2.x-dev
- 2.x - 2.x
pull_request: pull_request:
branches: branches:
- dev - 2.x-dev
- 2.x - 2.x
jobs: jobs:
@ -51,7 +51,6 @@ jobs:
packages/*/dist packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }} key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
test-unit: test-unit:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}