From dd0da098e1dc264c462f0632720b9d33b28930cd Mon Sep 17 00:00:00 2001 From: Chris Ball Date: Wed, 16 Dec 2020 10:11:14 -0500 Subject: [PATCH] ci: update GH Action & Cypress dependencies for a successful build. (#117) * update actions/setup-node to 2.1.2 * update vercel-action to amondnet/vercel-action@v20. This also sets the default vercel scope to secrets.VERCEL_ORG_ID * fixes Cypress issues Previously, we were accidently installing 2 versions of Cypress. See: https://github.com/cypress-io/cypress/issues/4595 --- .github/workflows/release.yml | 2 +- .github/workflows/tests.yml | 2 +- .../template/.github/workflows/main.js.yml.ejs | 6 +++--- packages/create-bison-app/template/package.json.ejs | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e477ab60..90cee460 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Node - uses: actions/setup-node@v2.1.1 + uses: actions/setup-node@v2.1.2 with: node-version: 14.6.0 registry-url: https://registry.npmjs.org diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 196c6c90..0a77615e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Setup Node - uses: actions/setup-node@v2.1.1 + uses: actions/setup-node@v2.1.2 with: node-version: ${{ matrix.node-version }} - name: Find yarn cache location diff --git a/packages/create-bison-app/template/.github/workflows/main.js.yml.ejs b/packages/create-bison-app/template/.github/workflows/main.js.yml.ejs index ae2180a6..5f215bf1 100644 --- a/packages/create-bison-app/template/.github/workflows/main.js.yml.ejs +++ b/packages/create-bison-app/template/.github/workflows/main.js.yml.ejs @@ -32,7 +32,7 @@ jobs: # Node - name: Setup Node - uses: actions/setup-node@v2.1.1 + uses: actions/setup-node@v2.1.2 with: node-version: 14.6.0 @@ -125,14 +125,14 @@ jobs: steps: - uses: actions/checkout@v2 <% if (host.name === 'vercel') { -%> - - uses: ngduc/vercel-deploy-action@master + - uses: amondnet/vercel-action@v20 with: vercel-token: ${{ secrets.VERCEL_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }} vercel-org-id: ${{ secrets.VERCEL_ORG_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} # SET THIS OR YOU WILL DEPLOY TO YOUR PERSONAL VERCEL NAMESPACE - # scope: ${{ secrets.VERCEL_TEAM_ID }} + # scope: ${{ secrets.VERCEL_ORG_ID }} <% } else if (host.name === 'heroku') { -%> - uses: akhileshns/heroku-deploy@v3.4.6 with: diff --git a/packages/create-bison-app/template/package.json.ejs b/packages/create-bison-app/template/package.json.ejs index 64500d1a..c1e1953f 100644 --- a/packages/create-bison-app/template/package.json.ejs +++ b/packages/create-bison-app/template/package.json.ejs @@ -11,6 +11,7 @@ "build:next": "next build", "build:nexus": "NODE_ENV=development ts-node -P tsconfig.cjs.json --transpile-only graphql/schema.ts", "cypress:open": "cypress open", + "cypress:run": "cypress run", "db:migrate": "yarn -s prisma migrate up --experimental && yarn build:prisma", "db:rollback": "yarn prisma migrate down --experimental && yarn build:prisma", "db:setup": "yarn db:migrate && yarn prisma generate", @@ -73,7 +74,7 @@ "@graphql-codegen/typescript-react-apollo": "1.17.6", "@graphql-codegen/typescript-resolvers": "1.17.4", "@prisma/cli": "2.8.1", - "@testing-library/cypress": "^6.0.0", + "@testing-library/cypress": "^7.0.2", "@testing-library/dom": "^7.21.7", "@testing-library/jest-dom": "^5.11.2", "@testing-library/react": "^10.4.7", @@ -86,7 +87,7 @@ "@vercel/node": "^1.7.3", "chance": "^1.1.6", "concurrently": "^5.2.0", - "cypress": "^5.0.0", + "cypress": "^6.1.0", "eslint": "^7.5.0", "eslint-plugin-cypress": "^2.11.1", "eslint-plugin-echobind": "^0.2.0",