From d904a6dcf236e77939cac809eb781e2c84bcb5b3 Mon Sep 17 00:00:00 2001 From: linglp Date: Tue, 15 Oct 2024 15:58:31 -0400 Subject: [PATCH 01/12] update tag --- cdk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdk.json b/cdk.json index 02897c1..5d6644e 100644 --- a/cdk.json +++ b/cdk.json @@ -31,7 +31,7 @@ "aws-cn" ], "dev": { - "IMAGE_PATH_AND_TAG": "ghcr.io/sage-bionetworks/schematic:v24.7.2", + "IMAGE_PATH_AND_TAG": "ghcr.io/sage-bionetworks/schematic:v0.1.85-beta", "AWS_DEFAULT_REGION": "us-east-1", "PORT": "443", "TAGS": { From 9faf9bbbd0db1e6a265285bfa1653cd676a3c215 Mon Sep 17 00:00:00 2001 From: linglp Date: Tue, 15 Oct 2024 16:01:22 -0400 Subject: [PATCH 02/12] re-commit --- cdk.json | 1 + 1 file changed, 1 insertion(+) diff --git a/cdk.json b/cdk.json index 5d6644e..19ee193 100644 --- a/cdk.json +++ b/cdk.json @@ -36,6 +36,7 @@ "PORT": "443", "TAGS": { "CostCenter": "NO PROGRAM / 000000" + }, "STACK_NAME_PREFIX": "schematic", "ACM_CERT_ARN": "arn:aws:acm:us-east-1:631692904429:certificate/0e9682f6-3ffa-46fb-9671-b6349f5164d6", From 296d86e883a00dfac4c0abe08b3c01ce4eda66d5 Mon Sep 17 00:00:00 2001 From: linglp Date: Tue, 15 Oct 2024 16:01:46 -0400 Subject: [PATCH 03/12] re-commit --- cdk.json | 1 - 1 file changed, 1 deletion(-) diff --git a/cdk.json b/cdk.json index 19ee193..5d6644e 100644 --- a/cdk.json +++ b/cdk.json @@ -36,7 +36,6 @@ "PORT": "443", "TAGS": { "CostCenter": "NO PROGRAM / 000000" - }, "STACK_NAME_PREFIX": "schematic", "ACM_CERT_ARN": "arn:aws:acm:us-east-1:631692904429:certificate/0e9682f6-3ffa-46fb-9671-b6349f5164d6", From 49830902dc3c1ce4f92ff06e2f7dbe29208ffb18 Mon Sep 17 00:00:00 2001 From: linglp Date: Tue, 15 Oct 2024 16:07:17 -0400 Subject: [PATCH 04/12] try re-run --- .github/workflows/aws-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index 7ac8ffd..a688299 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v3 - name: Static Analysis - uses: pre-commit/action@v3.0.0 + uses: pre-commit/action@v3.0.1 - name: cdk synth uses: youyo/aws-cdk-github-actions@v2 From a5baf3ae7c7db45849cf179eaa26af9dcaabb6de Mon Sep 17 00:00:00 2001 From: linglp Date: Tue, 15 Oct 2024 18:51:03 -0400 Subject: [PATCH 05/12] try updating workflow to create a virtual env --- .github/workflows/aws-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index a688299..47af737 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -18,6 +18,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Create and activate virtual environment + run: python3 -m venv venv + - name: Static Analysis uses: pre-commit/action@v3.0.1 From 2afc4dcc4eed8e2c56db6f018813471411d86055 Mon Sep 17 00:00:00 2001 From: linglp Date: Wed, 16 Oct 2024 11:25:34 -0400 Subject: [PATCH 06/12] activate virtual env --- .github/workflows/aws-deploy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index 47af737..162e7f7 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -19,10 +19,12 @@ jobs: uses: actions/checkout@v3 - name: Create and activate virtual environment - run: python3 -m venv venv + run: | + python3 -m venv venv + source venv/bin/activate - name: Static Analysis - uses: pre-commit/action@v3.0.1 + uses: pre-commit/action@v3.0.0 - name: cdk synth uses: youyo/aws-cdk-github-actions@v2 From 2e3d3de475c8093dd3355cdc865ed2fc869d4a12 Mon Sep 17 00:00:00 2001 From: linglp Date: Wed, 16 Oct 2024 11:27:47 -0400 Subject: [PATCH 07/12] change to a different pre-commit step --- .github/workflows/aws-deploy.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index 162e7f7..44ed535 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -23,8 +23,11 @@ jobs: python3 -m venv venv source venv/bin/activate - - name: Static Analysis - uses: pre-commit/action@v3.0.0 + - name: Install dependencies + run: pip3 install pre-commit + + - name: Run pre-commit + run: pre-commit run --all-files - name: cdk synth uses: youyo/aws-cdk-github-actions@v2 From 7c0e7f80b805b5eee6e14a25342c6f2d6701ba07 Mon Sep 17 00:00:00 2001 From: linglp Date: Wed, 16 Oct 2024 11:51:23 -0400 Subject: [PATCH 08/12] install pre-commit after activate virtual env --- .github/workflows/aws-deploy.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index 44ed535..8901b9f 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -18,13 +18,16 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Create and activate virtual environment + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.11' + + - name: Create and activate virtual environment and install pre-commit run: | python3 -m venv venv source venv/bin/activate - - - name: Install dependencies - run: pip3 install pre-commit + pip3 install pre-commit - name: Run pre-commit run: pre-commit run --all-files From ac10067b1291016ba0ca552968f18eb10be1bdc0 Mon Sep 17 00:00:00 2001 From: linglp Date: Wed, 16 Oct 2024 11:55:55 -0400 Subject: [PATCH 09/12] update to use pre-commit --- .github/workflows/aws-deploy.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index 8901b9f..63844ca 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -23,14 +23,15 @@ jobs: with: python-version: '3.11' - - name: Create and activate virtual environment and install pre-commit + - name: Create and activate virtual environment and install dependencies run: | python3 -m venv venv source venv/bin/activate pip3 install pre-commit + pip3 install -r requirements.txt -r requirements-dev.txt - name: Run pre-commit - run: pre-commit run --all-files + run: venv/bin/pre-commit run --all-files - name: cdk synth uses: youyo/aws-cdk-github-actions@v2 @@ -39,11 +40,8 @@ jobs: actions_comment: false cdk_args: '--context env=dev --debug' - - name: Install dependencies - run: pip install -r requirements.txt -r requirements-dev.txt - - name: Run unit tests - run: python -m pytest tests/ -s -v + run: venv/bin/python -m pytest tests/ -s -v cdk-deploy-dev: runs-on: ubuntu-latest From 566c01778bc83c71a80691ca33cfc50fa8361bda Mon Sep 17 00:00:00 2001 From: linglp Date: Wed, 16 Oct 2024 14:01:36 -0400 Subject: [PATCH 10/12] try keep everything as is --- .github/workflows/aws-deploy.yml | 36 ++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index 63844ca..6052325 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -18,20 +18,27 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: "3.x" - - name: Create and activate virtual environment and install dependencies - run: | - python3 -m venv venv - source venv/bin/activate - pip3 install pre-commit - pip3 install -r requirements.txt -r requirements-dev.txt + - name: Static Analysis + uses: pre-commit/action@v3.0.0 - - name: Run pre-commit - run: venv/bin/pre-commit run --all-files + # - name: Set up Python + # uses: actions/setup-python@v4 + # with: + # python-version: '3.11' + + # - name: Create and activate virtual environment and install dependencies + # run: | + # python3 -m venv venv + # source venv/bin/activate + # pip3 install pre-commit + # pip3 install -r requirements.txt -r requirements-dev.txt + + # - name: Run pre-commit + # run: venv/bin/pre-commit run --all-files - name: cdk synth uses: youyo/aws-cdk-github-actions@v2 @@ -40,8 +47,11 @@ jobs: actions_comment: false cdk_args: '--context env=dev --debug' - - name: Run unit tests - run: venv/bin/python -m pytest tests/ -s -v + - name: Install dependencies + run: pip install -r requirements.txt -r requirements-dev.txt + + # - name: Run unit tests + # run: venv/bin/python -m pytest tests/ -s -v cdk-deploy-dev: runs-on: ubuntu-latest From e6e343a5f69711cac90af5712e404085aeb47df6 Mon Sep 17 00:00:00 2001 From: linglp Date: Wed, 16 Oct 2024 14:07:41 -0400 Subject: [PATCH 11/12] remove comment --- .github/workflows/aws-deploy.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index 6052325..b7008cf 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -25,21 +25,6 @@ jobs: - name: Static Analysis uses: pre-commit/action@v3.0.0 - # - name: Set up Python - # uses: actions/setup-python@v4 - # with: - # python-version: '3.11' - - # - name: Create and activate virtual environment and install dependencies - # run: | - # python3 -m venv venv - # source venv/bin/activate - # pip3 install pre-commit - # pip3 install -r requirements.txt -r requirements-dev.txt - - # - name: Run pre-commit - # run: venv/bin/pre-commit run --all-files - - name: cdk synth uses: youyo/aws-cdk-github-actions@v2 with: @@ -50,9 +35,6 @@ jobs: - name: Install dependencies run: pip install -r requirements.txt -r requirements-dev.txt - # - name: Run unit tests - # run: venv/bin/python -m pytest tests/ -s -v - cdk-deploy-dev: runs-on: ubuntu-latest if: ${{ github.ref == 'refs/heads/dev' }} From dc4b8460826b5fd3cf07bbdadaa5362d0f719032 Mon Sep 17 00:00:00 2001 From: linglp Date: Wed, 16 Oct 2024 14:09:53 -0400 Subject: [PATCH 12/12] add the step of unit test back --- .github/workflows/aws-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml index b7008cf..b135331 100644 --- a/.github/workflows/aws-deploy.yml +++ b/.github/workflows/aws-deploy.yml @@ -35,6 +35,9 @@ jobs: - name: Install dependencies run: pip install -r requirements.txt -r requirements-dev.txt + - name: Run unit tests + run: python -m pytest tests/ -s -v + cdk-deploy-dev: runs-on: ubuntu-latest if: ${{ github.ref == 'refs/heads/dev' }}