Skip to content

Commit

Permalink
Chore: Fix errors on npm install on mac with M1 chip (#380)
Browse files Browse the repository at this point in the history
  • Loading branch information
samanthaandrews authored May 11, 2023
1 parent d7c8c23 commit a931278
Show file tree
Hide file tree
Showing 38 changed files with 44,528 additions and 18,489 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/build-production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,11 @@ jobs:
- name: checkout
uses: actions/checkout@v2

- id: nvmrc
run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)

- name: Set up node with version from nvm
- name: Setup Node
uses: actions/setup-node@v2
with: { node-version: "${{ steps.nvmrc.outputs.NODE_VERSION }}" }
with:
node-version-file: ".nvmrc"
cache: npm

- name: Configure AWS credentials from Test account
uses: aws-actions/configure-aws-credentials@v1
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/build-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ jobs:
- name: checkout
uses: actions/checkout@v2

- id: nvmrc
run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)

- name: Set up node with version from nvm
- name: Setup Node
uses: actions/setup-node@v2
with: { node-version: "${{ steps.nvmrc.outputs.NODE_VERSION }}" }
with:
node-version-file: ".nvmrc"
cache: npm

- name: Configure AWS credentials from Test account
uses: aws-actions/configure-aws-credentials@v1
Expand Down
45 changes: 20 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
CI: true
steps:
- uses: actions/checkout@v2
- id: nvmrc
run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)

- name: Use Node Version from nvmrc
uses: actions/setup-node@v1
with: { node-version: "${{ steps.nvmrc.outputs.NODE_VERSION }}" }
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version-file: ".nvmrc"
cache: npm

- name: Cache node modules
uses: actions/cache@v2
Expand All @@ -51,7 +51,7 @@ jobs:
${{ runner.os }}-
- name: Install Dependencies
run: npm run install:ci
run: npm ci

- name: Lint
run: npm run lint
Expand All @@ -63,12 +63,12 @@ jobs:
CI: true
steps:
- uses: actions/checkout@v2
- id: nvmrc
run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)

- name: Use Node Version from nvmrc
uses: actions/setup-node@v1
with: { node-version: "${{ steps.nvmrc.outputs.NODE_VERSION }}" }
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version-file: ".nvmrc"
cache: npm

- name: Cache node modules
uses: actions/cache@v2
Expand All @@ -84,7 +84,7 @@ jobs:
${{ runner.os }}-
- name: Install Dependencies
run: npm run install:ci
run: npm ci

- name: Typecheck
run: node_modules/typescript/bin/tsc --noEmit
Expand All @@ -96,12 +96,12 @@ jobs:
CI: true
steps:
- uses: actions/checkout@v2
- id: nvmrc
run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)

- name: Use Node Version from nvmrc
uses: actions/setup-node@v1
with: { node-version: "${{ steps.nvmrc.outputs.NODE_VERSION }}" }
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version-file: ".nvmrc"
cache: npm

- name: Cache node modules
uses: actions/cache@v2
Expand All @@ -117,7 +117,7 @@ jobs:
${{ runner.os }}-
- name: Install Dependencies
run: npm run install:ci
run: npm ci

- name: Test
run: npm run test
Expand All @@ -126,17 +126,12 @@ jobs:
# Don't push anything to ECR, just build the docker image to make sure there are no build failures
name: Build Docker Image
runs-on: ubuntu-latest
env:
CI: true
steps:
- name: checkout
uses: actions/checkout@v2

- id: nvmrc
run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)

- name: Set up node with version from nvm
uses: actions/setup-node@v2
with: { node-version: "${{ steps.nvmrc.outputs.NODE_VERSION }}" }

- name: Build image
env:
AIRTABLE_KEY: ${{ secrets.AIRTABLE_API_KEY }}
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ vega.feature
vega.spec.ts

# New Relic
newrelic_agent.log
newrelic_agent.log

.vscode
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.13.0
v16.19.0
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
- Add Part of Collection to Edition/Work pages
- Add Collection page
- Add collection placeholder image
- Chore: fresh package-lock.json install and fix install errors on mac with M1 chip
- Add Playwright/Cucumber tests to support new Recently Added Collections feature on landing page

## [0.16.1]

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV NEW_RELIC_APP_NAME $NEW_RELIC_APP_NAME

# Install dependencies.
COPY package.json package-lock.json ./
RUN npm run install:ci
RUN npm ci --cache .npm

# Copy the app files.
COPY . ./
Expand Down
10 changes: 0 additions & 10 deletions cucumber.js

This file was deleted.

9 changes: 9 additions & 0 deletions cucumber.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"default": {
"import": ["playwright/tests/**/*.ts", "playwright/support/**/*.ts"],
"worldParameters": {
"appUrl": "https://drb-qa.nypl.org/",
"headless": false
}
}
}
Loading

1 comment on commit a931278

@vercel
Copy link

@vercel vercel bot commented on a931278 May 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.