From 4822a1316038f3bb2d20f8ed3a0bf4a5112f2c2a Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 25 Jun 2024 15:37:22 +0300 Subject: [PATCH 1/6] Deploy Workflow build --- .github/workflows/roboshield-deploy-dev.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml index 5f8ab17e8..e8c032892 100644 --- a/.github/workflows/roboshield-deploy-dev.yml +++ b/.github/workflows/roboshield-deploy-dev.yml @@ -2,7 +2,7 @@ name: RoboShield | Deploy | DEV on: push: - branches: [main] + branches: [roboshield/workflow-build] paths: - "apps/roboshield/**" - "Dockerfile" @@ -55,10 +55,10 @@ jobs: uses: docker/build-push-action@v3 with: build-args: | - MONGO_URL=${{ secrets.CHARTERAFRICA_MONGO_URL }} + MONGO_URL=${{ secrets.ROBOSHIELD_MONGO_URL }} NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }} - NEXT_PUBLIC_SENTRY_DSN=${{ secrets.CHARTERAFRICA_SENTRY_DSN }} - PAYLOAD_SECRET_KEY=${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }} + NEXT_PUBLIC_SENTRY_DSN=${{ secrets.ROBOSHIELD_SENTRY_DSN }} + PAYLOAD_SECRET_KEY=${{ secrets.ROBOSHIELD_PAYLOAD_SECRET_KEY }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }} SENTRY_ORG=${{ secrets.SENTRY_ORG }} @@ -66,7 +66,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . - target: charterafrica-runner + target: roboshield-runner file: Dockerfile push: true tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}" From 2355b70fbd78276548e1f7ea3cd27b4003c6ee09 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 25 Jun 2024 15:40:52 +0300 Subject: [PATCH 2/6] Test Deployment --- .github/workflows/roboshield-deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml index e8c032892..d37ad916c 100644 --- a/.github/workflows/roboshield-deploy-dev.yml +++ b/.github/workflows/roboshield-deploy-dev.yml @@ -6,7 +6,7 @@ on: paths: - "apps/roboshield/**" - "Dockerfile" - - ".github/workflows/roboshield-dev.yml" + - ".github/workflows/roboshield-deploy-dev.yml" concurrency: group: "${{ github.workflow }} @ ${{ github.ref }}" From cacccdacdfe8b00e60287c1ead166d8caac21a21 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 25 Jun 2024 15:46:01 +0300 Subject: [PATCH 3/6] Fix failing build --- .github/workflows/roboshield-deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml index d37ad916c..2e889e87c 100644 --- a/.github/workflows/roboshield-deploy-dev.yml +++ b/.github/workflows/roboshield-deploy-dev.yml @@ -58,7 +58,7 @@ jobs: MONGO_URL=${{ secrets.ROBOSHIELD_MONGO_URL }} NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }} NEXT_PUBLIC_SENTRY_DSN=${{ secrets.ROBOSHIELD_SENTRY_DSN }} - PAYLOAD_SECRET_KEY=${{ secrets.ROBOSHIELD_PAYLOAD_SECRET_KEY }} + PAYLOAD_SECRET=${{ secrets.ROBOSHIELD_PAYLOAD_SECRET_KEY }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }} SENTRY_ORG=${{ secrets.SENTRY_ORG }} From 969e047770fbea92c66c7fcccae116fd1c105e60 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 25 Jun 2024 15:59:39 +0300 Subject: [PATCH 4/6] TRIGGER REBUILD --- apps/roboshield/src/lib/data/local/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/roboshield/src/lib/data/local/index.ts b/apps/roboshield/src/lib/data/local/index.ts index d2639d104..9b39e0778 100644 --- a/apps/roboshield/src/lib/data/local/index.ts +++ b/apps/roboshield/src/lib/data/local/index.ts @@ -7,7 +7,6 @@ export async function getPageServerSideProps(context: AppContext) { if (!props) { return { notFound: true }; } - return { props, }; From 9cfc9c3ebddcae7cff2cb6a4449fe57f3354287b Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 25 Jun 2024 16:10:43 +0300 Subject: [PATCH 5/6] Revert branch to Main --- .github/workflows/roboshield-deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml index 2e889e87c..0e1e71652 100644 --- a/.github/workflows/roboshield-deploy-dev.yml +++ b/.github/workflows/roboshield-deploy-dev.yml @@ -2,7 +2,7 @@ name: RoboShield | Deploy | DEV on: push: - branches: [roboshield/workflow-build] + branches: [main] paths: - "apps/roboshield/**" - "Dockerfile" From 41b6d4c7115f1fac2532775136ccc51a37129144 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 25 Jun 2024 16:46:26 +0300 Subject: [PATCH 6/6] Rename Roboshield payload Secret --- .github/workflows/roboshield-deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml index 0e1e71652..ab5a41c37 100644 --- a/.github/workflows/roboshield-deploy-dev.yml +++ b/.github/workflows/roboshield-deploy-dev.yml @@ -58,7 +58,7 @@ jobs: MONGO_URL=${{ secrets.ROBOSHIELD_MONGO_URL }} NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }} NEXT_PUBLIC_SENTRY_DSN=${{ secrets.ROBOSHIELD_SENTRY_DSN }} - PAYLOAD_SECRET=${{ secrets.ROBOSHIELD_PAYLOAD_SECRET_KEY }} + PAYLOAD_SECRET=${{ secrets.ROBOSHIELD_PAYLOAD_SECRET }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }} SENTRY_ORG=${{ secrets.SENTRY_ORG }}