From 6180b3338ad7a3ad6ce683a2d0b4082d9363dadc Mon Sep 17 00:00:00 2001 From: Michael Peyper Date: Sun, 1 Aug 2021 23:14:29 +1000 Subject: [PATCH] chore(ci): clean up validate scripts to remove duplication --- .github/workflows/validate.yml | 4 ++-- package.json | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 2bdcf04e..b6d12ed5 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -38,8 +38,8 @@ jobs: env: HUSKY_SKIP_INSTALL: true - - name: Use React version - run: npm install --save-dev react@"${{ matrix.react }}" react-dom@"${{ matrix.react }}" react-test-renderer@"${{ matrix.react }}" + - name: ⚛️ Use React version + run: REACT_VERSION=${{ matrix.react }} npm run install:react - name: ▶️ Run validate script run: npm run validate diff --git a/package.json b/package.json index ba03720e..4f36440a 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,10 @@ "docs:dev": "docz dev", "docs:build": "docz build", "contributors:add": "all-contributors add", - "install:react-16-9": "npm install --no-save react@16.9.0 react-dom@16.9.0 react-test-renderer@16.9.0", - "install:react-16": "npm install --no-save react@^16 react-dom@^16 react-test-renderer@^16", - "install:react-17": "npm install --no-save react@^17 react-dom@^17 react-test-renderer@^17" + "install:react": "npm install --no-save react@${REACT_VERSION:-latest} react-dom@${REACT_VERSION:-latest} react-test-renderer@${REACT_VERSION:-latest}", + "install:react-16.9.0": "cross-env REACT_VERSION=16.9.0 npm run install:react", + "install:react-16": "cross-env REACT_VERSION=^16 npm run install:react", + "install:react-17": "cross-env REACT_VERSION=^17 npm run install:react" }, "dependencies": { "@babel/runtime": "^7.12.5", @@ -59,6 +60,7 @@ "@typescript-eslint/parser": "4.28.5", "all-contributors-cli": "6.20.0", "codecov": "3.8.3", + "cross-env": "^7.0.3", "docz": "2.3.1", "docz-theme-default": "1.2.0", "docz-utils": "2.3.0",