From 976dc1323f523dd5d9132768901455527f063550 Mon Sep 17 00:00:00 2001 From: PratheepV Date: Fri, 9 Sep 2022 10:47:33 +0530 Subject: [PATCH 1/4] Staging site related changes --- .github/workflows/cd.yml | 11 ++++++-- .github/workflows/ci.yml | 7 ++++++ .github/workflows/staging-cd.yml | 43 ++++++++++++++++++++++++++++++++ gatsby-config.js | 14 +++++------ 4 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/staging-cd.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c02daba..d50b4d9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -2,7 +2,7 @@ name: 'CD' on: push: branches: - - 'dev' + - 'main' jobs: Deploy: runs-on: ubuntu-latest @@ -25,6 +25,13 @@ jobs: echo GATSBY_ALGOLIA_APP_ID=${{ secrets.GATSBY_ALGOLIA_APP_ID }} >> .env echo GATSBY_ALGOLIA_SEARCH_KEY=${{ secrets.GATSBY_ALGOLIA_SEARCH_KEY }} >> .env echo ALGOLIA_ADMIN_KEY=${{ secrets.ALGOLIA_ADMIN_KEY }} >> .env + echo BUCKET_NAME=${{ secrets.BUCKET_NAME }} >> .env + echo HOST_NAME=${{ secrets.HOST_NAME }} >> .env + echo ASSET_HOST=${{ secrets.ASSET_HOST }} >> .env + echo FRESHCHAT_TOKEN=${{ secrets.FRESHCHAT_TOKEN }} >> .env + echo GA_TRACKING_ID=${{ secrets.GA_TRACKING_ID }} >> .env + echo GTAG_TRACKING_ID_FOR_GA4=${{ secrets.GTAG_TRACKING_ID_FOR_GA4 }} >> .env + echo GTAG_TRACKING_ID_FOR_GTAG=${{ secrets.GTAG_TRACKING_ID_FOR_GTAG }} >> .env cat .env - name: Build run: | @@ -33,4 +40,4 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-east-1' - AWS_DEFAULT_OUTPUT: json \ No newline at end of file + AWS_DEFAULT_OUTPUT: json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75df446..cdb1186 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,13 @@ jobs: echo GATSBY_ALGOLIA_APP_ID=${{ secrets.GATSBY_ALGOLIA_APP_ID }} >> .env echo GATSBY_ALGOLIA_SEARCH_KEY=${{ secrets.GATSBY_ALGOLIA_SEARCH_KEY }} >> .env echo ALGOLIA_ADMIN_KEY=${{ secrets.ALGOLIA_ADMIN_KEY }} >> .env + echo BUCKET_NAME=${{ secrets.BUCKET_NAME }} >> .env + echo HOST_NAME=${{ secrets.HOST_NAME }} >> .env + echo ASSET_HOST=${{ secrets.ASSET_HOST }} >> .env + echo FRESHCHAT_TOKEN=${{ secrets.FRESHCHAT_TOKEN }} >> .env + echo GA_TRACKING_ID=${{ secrets.GA_TRACKING_ID }} >> .env + echo GTAG_TRACKING_ID_FOR_GA4=${{ secrets.GTAG_TRACKING_ID_FOR_GA4 }} >> .env + echo GTAG_TRACKING_ID_FOR_GTAG=${{ secrets.GTAG_TRACKING_ID_FOR_GTAG }} >> .env cat .env - name: Build run: | diff --git a/.github/workflows/staging-cd.yml b/.github/workflows/staging-cd.yml new file mode 100644 index 0000000..847144d --- /dev/null +++ b/.github/workflows/staging-cd.yml @@ -0,0 +1,43 @@ +name: 'Staging CD' +on: + push: + branches: + - 'grunt/staging-cd' +jobs: + StagingDeploy: + runs-on: ubuntu-latest + steps: + - name: Install libvips + run: sudo apt-get install libvips + - uses: actions/checkout@v2 + - name: Setup Node 12 + uses: actions/setup-node@v2 + with: + node-version: '12' + - name: Install dependencies + run: | + npm ci --ignore-scripts --unsafe-perm + - name: Force installing sharp + run: npm install --ignore-scripts=false --verbose sharp + - name: 'Create env file' + run: | + touch .env + echo GATSBY_ALGOLIA_APP_ID=${{ secrets.STAGING_GATSBY_ALGOLIA_APP_ID }} >> .env + echo GATSBY_ALGOLIA_SEARCH_KEY=${{ secrets.STAGING_GATSBY_ALGOLIA_SEARCH_KEY }} >> .env + echo ALGOLIA_ADMIN_KEY=${{ secrets.STAGING_ALGOLIA_ADMIN_KEY }} >> .env + echo BUCKET_NAME=${{ secrets.STAGING_BUCKET_NAME }} >> .env + echo HOST_NAME=${{ secrets.STAGING_HOST_NAME }} >> .env + echo ASSET_HOST=${{ secrets.STAGING_ASSET_HOST }} >> .env + echo FRESHCHAT_TOKEN=${{ secrets.STAGING_FRESHCHAT_TOKEN }} >> .env + echo GA_TRACKING_ID=${{ secrets.STAGING_GA_TRACKING_ID }} >> .env + echo GTAG_TRACKING_ID_FOR_GA4=${{ secrets.STAGING_GTAG_TRACKING_ID_FOR_GA4 }} >> .env + echo GTAG_TRACKING_ID_FOR_GTAG=${{ secrets.STAGING_GTAG_TRACKING_ID_FOR_GTAG }} >> .env + cat .env + - name: Build + run: | + PREFIX_PATHS=true npm run build && npm run deploy + env: + AWS_ACCESS_KEY_ID: ${{ secrets.STAGING_AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_AWS_SECRET_ACCESS_KEY }} + AWS_DEFAULT_REGION: 'us-east-1' + AWS_DEFAULT_OUTPUT: json diff --git a/gatsby-config.js b/gatsby-config.js index 2413fca..ed720f0 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -57,7 +57,7 @@ const queries = [ module.exports = { - assetPrefix: `https://d9g73a6nhcae6.cloudfront.net`, + assetPrefix: process.env.ASSET_HOST, siteMetadata: { title: 'Testsigma Tutorials', description: '', @@ -74,9 +74,9 @@ module.exports = { { resolve: `gatsby-plugin-s3`, options: { - bucketName: "tutorials.testsigma.com", + bucketName: process.env.BUCKET_NAME, protocol: "https", - hostname: "testsigma.com/tutorials/", + hostname: process.env.HOST_NAME, generateRedirectObjectsForPermanentRedirects: true }, }, @@ -102,14 +102,14 @@ module.exports = { { resolve: `gatsby-plugin-freshchat`, options: { - token: "b905859c-c256-471f-ab0a-a4d0829d27ee", // process.env.FRESHCHAT_TOKEN, + token: process.env.FRESHCHAT_TOKEN, host: "https://wchat.freshchat.com", }, }, { resolve: `gatsby-plugin-google-analytics`, options: { - trackingId: "UA-99606664-1", + trackingId: process.env.GA_TRACKING_ID, head: false, anonymize: true, respectDNT: true, @@ -120,8 +120,8 @@ module.exports = { resolve: `gatsby-plugin-google-gtag`, options: { trackingIds: [ - "G-ZE2Z1J3VPK", // Google Analytics 4 - "AW-777462306", // Google Tag Manager + process.env.GTAG_TRACKING_ID_FOR_GA4, // Google Analytics 4 + process.env.GTAG_TRACKING_ID_FOR_GTAG, // Google Tag Manager ], pluginConfig: { head: false, From 790dd89fef8d38a7355ef1f1de5f488537419ad0 Mon Sep 17 00:00:00 2001 From: PratheepV Date: Fri, 9 Sep 2022 10:50:02 +0530 Subject: [PATCH 2/4] sharp installation issue --- .github/workflows/staging-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/staging-cd.yml b/.github/workflows/staging-cd.yml index 847144d..3c877bb 100644 --- a/.github/workflows/staging-cd.yml +++ b/.github/workflows/staging-cd.yml @@ -18,7 +18,7 @@ jobs: run: | npm ci --ignore-scripts --unsafe-perm - name: Force installing sharp - run: npm install --ignore-scripts=false --verbose sharp + run: npm install --ignore-scripts=false --verbose sharp@0.30.7 - name: 'Create env file' run: | touch .env From 4e4efb1ab6d18dd2c674a44ed8e8cdb9ce4e3f62 Mon Sep 17 00:00:00 2001 From: PratheepV Date: Fri, 9 Sep 2022 11:20:06 +0530 Subject: [PATCH 3/4] Staging CD branch name changes --- .github/workflows/staging-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/staging-cd.yml b/.github/workflows/staging-cd.yml index 3c877bb..8d3a829 100644 --- a/.github/workflows/staging-cd.yml +++ b/.github/workflows/staging-cd.yml @@ -2,7 +2,7 @@ name: 'Staging CD' on: push: branches: - - 'grunt/staging-cd' + - 'dev' jobs: StagingDeploy: runs-on: ubuntu-latest From ea7d8ad2582a6eed65232a005fcd13ec6bb4d8c4 Mon Sep 17 00:00:00 2001 From: PratheepV Date: Fri, 9 Sep 2022 11:23:07 +0530 Subject: [PATCH 4/4] sharp installation fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdb1186..f5d672f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: run: | npm ci --ignore-scripts --unsafe-perm - name: Force installing sharp - run: npm install --ignore-scripts=false --verbose sharp + run: npm install --ignore-scripts=false --verbose sharp@0.30.7 - name: 'Create env file' run: | touch .env