From 17a4c9e8d4716a3aac3d7fbfdf2004083fc28c29 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Mon, 24 Jul 2023 18:07:15 +0100 Subject: [PATCH 1/3] Fix timeout --- src/cfn/template.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cfn/template.yaml b/src/cfn/template.yaml index 67628e8..70e698d 100644 --- a/src/cfn/template.yaml +++ b/src/cfn/template.yaml @@ -4,9 +4,9 @@ Transform: AWS::Serverless-2016-10-31 Globals: Function: - Runtime: nodejs16.x - MemorySize: 128 - Timeout: 60 + Runtime: nodejs18.x + MemorySize: 1024 + Timeout: 300 Environment: Variables: COGNITO_IDENTITY_POOL: !Ref CognitoIdentityPool @@ -16,7 +16,7 @@ Globals: CREATE_CLOUDFRONT_DISTRIBUTION: !Ref CreateCloudFrontDistribution REGION: !Ref AWS::Region TO_BUCKET: !Ref WebUIBucket - VERSION: "1.7" + VERSION: "1.8" Parameters: AdminEmail: From 4bd47b79d06b0054ec1ed0191f471d137b146f90 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Mon, 24 Jul 2023 18:11:55 +0100 Subject: [PATCH 2/3] Update cfn-lint --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3088fd7..601e628 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ awscli==1.25.97 cfn_flip==1.3.0 -cfn_lint==0.68.1 +cfn_lint==0.77.3 From 1053e1f19128c25ddeeb617f477efdc84178dcd6 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Mon, 24 Jul 2023 18:19:53 +0100 Subject: [PATCH 3/3] Update python dependencies and use Python 3.10/node 18 consistently --- .github/workflows/publish.yaml | 8 ++++---- .github/workflows/release.yaml | 8 ++++---- .github/workflows/unit-tests.yaml | 4 ++-- CONTRIBUTING.md | 2 +- requirements.txt | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c5ee71d..d96ba65 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -36,14 +36,14 @@ jobs: restore-keys: | ${{ runner.os }}-pip- # Setup - - name: Set up Python 3.7 + - name: Set up Python 3.10 uses: actions/setup-python@v1 with: - python-version: 3.7 - - name: Set up Nodejs 16 + python-version: '3.10' # have to use quotes due to 0 being removed + - name: Set up Nodejs 18 uses: actions/setup-node@v1 with: - node-version: 16 + node-version: 18 - name: Install node dependencies run: npm i - name: Install python dependencies diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b9a1ece..b022f2d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,14 +20,14 @@ jobs: restore-keys: | ${{ runner.os }}-node- # Setup - - name: Set up Python 3.7 + - name: Set up Python 3.10 uses: actions/setup-python@v1 with: - python-version: 3.7 - - name: Set up Nodejs 16 + python-version: '3.10' # have to use quotes due to 0 being removed + - name: Set up Nodejs 18 uses: actions/setup-node@v1 with: - node-version: 16 + node-version: 18 - name: Install dependencies run: npm i - name: Install python dependencies diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 2504e57..7f1a609 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -23,10 +23,10 @@ jobs: restore-keys: | # Setup - - name: Set up Nodejs 16 + - name: Set up Nodejs 18 uses: actions/setup-node@v1 with: - node-version: 16 + node-version: 18 - name: Set up Python uses: actions/setup-python@v2 with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 770f567..437e33c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,7 +78,7 @@ We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikiped The following applications are required to contribute: -* Node.js >=v12 +* Node.js >=v18 * AWS CLI To start, run `npm install`. diff --git a/requirements.txt b/requirements.txt index 601e628..38a5ae9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -awscli==1.25.97 +awscli==1.29.9 cfn_flip==1.3.0 -cfn_lint==0.77.3 +cfn_lint==0.78.2