Skip to content

Commit

Permalink
Merge pull request #344 from NYPL/qa
Browse files Browse the repository at this point in the history
Merge qa into production for Bib Page deployment
  • Loading branch information
dgcohen authored Oct 3, 2024
2 parents 30bbf2f + 5f49029 commit 8fd77b8
Show file tree
Hide file tree
Showing 56 changed files with 1,499 additions and 472 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/deploy_production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Deploys to research-catalog-production
name: deploy production

on:
push:
branches:
- production

permissions:
id-token: write
contents: read

env:
AWS_DEFAULT_REGION: us-east-1
LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:production-latest

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::946183545209:role/GithubActionsDeployerRole
aws-region: us-east-1

- name: Log in to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2

- name: Build and push Docker image to Amazon ECR
run: |
docker build --build-arg NEXT_PUBLIC_APP_ENV=production --tag $LOCAL_TAG_NAME .
docker tag $LOCAL_TAG_NAME $ECR_URL
# Re-tag last latest image just in case
MANIFEST=$(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="production-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="production-previous" || true
aws ecr put-image --repository-name research-catalog --image-tag "production-previous" --image-manifest "$MANIFEST" || true
docker push $ECR_URL
- name: Update ECS service
run: |
aws ecs update-service --cluster research-catalog-production --service research-catalog-production --force-new-deployment
48 changes: 48 additions & 0 deletions .github/workflows/deploy_qa.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Deploys to research-catalog-qa
name: deploy qa

on:
push:
branches:
- qa
- SCC-4218/move-rc-from-travis-to-github-actions

permissions:
id-token: write
contents: read

env:
AWS_DEFAULT_REGION: us-east-1
LOCAL_TAG_NAME: research-catalog:${{ github.ref_name }}-${{ github.run_number }}
ECR_URL: 946183545209.dkr.ecr.us-east-1.amazonaws.com/research-catalog:qa-latest

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::946183545209:role/GithubActionsDeployerRole
aws-region: us-east-1

- name: Log in to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2

- name: Build and push Docker image to Amazon ECR
run: |
docker build --build-arg NEXT_PUBLIC_APP_ENV=qa --tag $LOCAL_TAG_NAME .
docker tag $LOCAL_TAG_NAME $ECR_URL
# Re-tag last latest image just in case
MANIFEST=$(aws ecr batch-get-image --repository-name research-catalog --image-ids imageTag="qa-latest" --output json | jq --raw-output --join-output '.images[0].imageManifest')
aws ecr batch-delete-image --repository-name research-catalog --image-ids imageTag="qa-previous" || true
aws ecr put-image --repository-name research-catalog --image-tag "qa-previous" --image-manifest "$MANIFEST" || true
docker push $ECR_URL
- name: Update ECS service
run: |
aws ecs update-service --cluster research-catalog-qa --service research-catalog-qa --force-new-deployment
6 changes: 3 additions & 3 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: npm install
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
63 changes: 0 additions & 63 deletions .travis.yml

This file was deleted.

33 changes: 33 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,35 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.3.0] 2024-10-3

### Added

## Hotfix

- Fix bug where the "View fewer" button was not appearing when filters weren't applied

### Fixed

- Small styling fixes after DS version bump to 3.4.0 (SCC-4264)
- Fix bug where "undefined" appears in the search results heading (SCC-4277)
- VQA second pass miscellaneous fixes (SCC-4264)
- Fixed accessibility issue on Bib page where focus moves to Displaying text when filters are controlled via MultiSelect. This will change when dynamic updates are replaced with an apply button (SCC-4246)

### Updated

- Bump DS version to 3.4.0
- Bump nvmrc version to Node 20.
- Update error message in Item Filter Year to include new error message prefix from the DS.
- Integrate view_all query param on client side and remove batched fetch (SCC-4287)
- Replaced travis with github actions (SCC-4218)
- Sentence case and rearrange search options (SCC-4260)

Added the following, but commented out for later release:

- Call number search scope to search dropdown options [(SCC-4260)](https://newyorkpubliclibrary.atlassian.net/browse/SCC-4260)
- Search tip per search scope [(SCC-4263)](https://newyorkpubliclibrary.atlassian.net/browse/SCC-4263)

## [1.2.4] 2024-08-29

### Fixed
Expand All @@ -24,6 +53,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Fixed some accessibility issues including making Request button titles more specific and fixing a layout issue on zoom. (SCC-4234)

### Fixed

- Fixed visual and copy issues found in VQA (SCC-4235)

## [1.2.2] 2024-08-14

### Updated
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine AS production
FROM node:20-alpine AS production

#RUN apt-get update
#RUN apt-get upgrade -y
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine
FROM node:20-alpine

WORKDIR /app

Expand Down
Loading

0 comments on commit 8fd77b8

Please sign in to comment.