Skip to content

Commit

Permalink
Merge pull request #402 from UN-OCHA/release/v1.7.0
Browse files Browse the repository at this point in the history
📦️ Prepare release `v1.7.0` and deploy to stage
  • Loading branch information
Pl217 authored Nov 6, 2023
2 parents 4d24478 + c6b9c8d commit 3e410f2
Show file tree
Hide file tree
Showing 7 changed files with 414 additions and 328 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 25
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.HPC_ECR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.HPC_ECR_AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1

- name: Login to Public ECR
if: ${{ github.actor != 'dependabot[bot]' }}
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: public.ecr.aws
username: ${{ secrets.HPC_ECR_AWS_ACCESS_KEY_ID }}
Expand Down
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"singleQuote": true
"singleQuote": true,
"trailingComma": "es5"
}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/unocha/nodejs-builder:18-alpine AS builder
FROM public.ecr.aws/unocha/nodejs-builder:20-alpine AS builder
WORKDIR /srv/src
COPY . .
ARG ENVIRONMENT=production
Expand Down
2 changes: 1 addition & 1 deletion libs/hpc-ui/src/lib/i18n/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const parseString = (lang: string, str: string): ParsedTranslation => {
*/
export class Translations<
LanguageKey extends string,
Strings
Strings,
> extends i18n.Translations<LanguageKey, Strings> {
/**
* A mapping from language -> string -> ParsedTranslation
Expand Down
Loading

0 comments on commit 3e410f2

Please sign in to comment.