From 7f508449b8df7446c1c59353483bd5643fee3bb3 Mon Sep 17 00:00:00 2001 From: Steven Hobson-Campbell Date: Sat, 15 Feb 2020 14:45:32 -0800 Subject: [PATCH] Update workflows --- .github/workflows/build.yml | 7 +++++-- .github/workflows/publish.yml | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8a5aa4..ab69317 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,10 @@ name: Build and Test on: push: branches: - - master + - master pull_request: branches: - - master + - master jobs: build: @@ -18,13 +18,16 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} + - name: Install yarn run: | npm -g i yarn + - name: npm install, build, and test run: | yarn diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 32dc2c6..344667d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,6 +11,11 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: "10.x" + registry-url: "https://registry.npmjs.org" + - name: Check if version bump id: check uses: EndBug/version-check@v1.1.1 @@ -19,10 +24,6 @@ jobs: if: steps.check.outputs.changed != 'true' run: echo "No version change" - - name: Install yarn - if: steps.check.outputs.changed == 'true' - run: npm -g i yarn - - name: Install deps if: steps.check.outputs.changed == 'true' run: yarn