From b5626af8760ea8a09eddfc1ea339ff1814aa6442 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 24 Oct 2022 20:04:49 +0800 Subject: [PATCH 1/6] test gha optimization --- .github/workflows/staging.yml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 6781a82..2d34f00 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -9,10 +9,30 @@ env: AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }} jobs: - deploy_sls: + validation: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v2 + id: website + with: + filters: | + src: + - 'src/**' + - uses: dorny/paths-filter@v2 + id: lambdas + with: + filters: | + lambdas: + - 'lambdas/**' + + deploy_sls: + needs: validation + if: steps.lambdas.outputs.lambdas == 'true' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -30,6 +50,8 @@ jobs: entrypoint: /bin/sh deploy: + needs: validation + if: steps.website.outputs.src == 'true' runs-on: ubuntu-latest steps: - name: inject slug/short variables @@ -47,6 +69,12 @@ jobs: override: true - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + src: + - 'src/**' - name: Apply Staging Configuration run: | @@ -72,7 +100,6 @@ jobs: with: cmd: '.github/prepare-thumb-images.sh src/data/packages.json ./src/static/Images/packages/' - - run: .github/mk-pantry-accessible.sh ${{ secrets.TEMP_JACOBS_GITHUB_PAT }} - uses: teaxyz/setup@v0 From fb68f237aefd0a62720fbcff39d457980e421a5d Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 24 Oct 2022 20:10:08 +0800 Subject: [PATCH 2/6] test job validation --- .github/workflows/staging.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 2d34f00..23a4dec 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -11,6 +11,9 @@ env: jobs: validation: runs-on: ubuntu-latest + ouputs: + website: ${{steps.website.outputs.src}} + lambdas: ${{steps.lambdas.outputs.lambdas}} steps: - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 @@ -28,7 +31,7 @@ jobs: deploy_sls: needs: validation - if: steps.lambdas.outputs.lambdas == 'true' + if: needs.validation.outputs.lambdas == 'true' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -51,7 +54,7 @@ jobs: deploy: needs: validation - if: steps.website.outputs.src == 'true' + if: needs.validation.outputs.website == 'true' runs-on: ubuntu-latest steps: - name: inject slug/short variables From 1052f6f4884616997d9c7fbcebf66a9d9a0e21fb Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 24 Oct 2022 20:11:47 +0800 Subject: [PATCH 3/6] fix outputs --- .github/workflows/staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 23a4dec..9bb5dc2 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -11,7 +11,7 @@ env: jobs: validation: runs-on: ubuntu-latest - ouputs: + outputs: website: ${{steps.website.outputs.src}} lambdas: ${{steps.lambdas.outputs.lambdas}} steps: From 1a848708f7aa05be43c7b4474f531e865bfb62dd Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 24 Oct 2022 20:15:27 +0800 Subject: [PATCH 4/6] test deployment of website --- .github/workflows/staging.yml | 2 +- src/layouts/index.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 9bb5dc2..f87844c 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -29,7 +29,7 @@ jobs: lambdas: - 'lambdas/**' - deploy_sls: + serverless: needs: validation if: needs.validation.outputs.lambdas == 'true' runs-on: ubuntu-latest diff --git a/src/layouts/index.html b/src/layouts/index.html index b2c0c19..8353688 100644 --- a/src/layouts/index.html +++ b/src/layouts/index.html @@ -20,7 +20,6 @@ position:relative; z-index: 2; } -
From 61fd5ed03e7addc7a6d7cdc8e73d65d8d9d46cde Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 24 Oct 2022 20:18:28 +0800 Subject: [PATCH 5/6] fix type in buildPackages fn --- lambdas/src/functions/buildPackages/handler.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lambdas/src/functions/buildPackages/handler.ts b/lambdas/src/functions/buildPackages/handler.ts index e2af809..de42f4a 100644 --- a/lambdas/src/functions/buildPackages/handler.ts +++ b/lambdas/src/functions/buildPackages/handler.ts @@ -39,6 +39,7 @@ interface FinalPackageOutput { interface AirtablePackageDict { [slug: string]: AirtablePackage } + const getFinalPackagesData = async (s3Packages: S3Package[], airtablePackages: AirtablePackage[]): Promise => { const newPackages: NewAirtablePackage[] = []; const packagesJson: Package[] = []; @@ -75,6 +76,7 @@ const getFinalPackagesData = async (s3Packages: S3Package[], airtablePackages: A homepage, desc, installs: 0, // TODO: get from algolia + dl_count: 0, thumb_image_url: '', } newPackages.push(newPackage); @@ -88,5 +90,4 @@ const getFinalPackagesData = async (s3Packages: S3Package[], airtablePackages: A } } - export const main = buildPackages; From cfe612d4a6d3dfbc9cc2dfa54c51156c12018a29 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 24 Oct 2022 20:30:17 +0800 Subject: [PATCH 6/6] rm unused step --- .github/workflows/staging.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index f87844c..315e43a 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -72,12 +72,6 @@ jobs: override: true - uses: actions/checkout@v3 - - uses: dorny/paths-filter@v2 - id: changes - with: - filters: | - src: - - 'src/**' - name: Apply Staging Configuration run: |