From 2bff6b8513070f2904c4448d1dab9cf0a310bfb6 Mon Sep 17 00:00:00 2001 From: Lessa <82185307+AldemirLucas@users.noreply.github.com> Date: Thu, 5 Oct 2023 22:51:33 -0300 Subject: [PATCH 1/5] Update --- next/pages/_app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/next/pages/_app.js b/next/pages/_app.js index d5fe53b0..e88e57c0 100644 --- a/next/pages/_app.js +++ b/next/pages/_app.js @@ -12,7 +12,6 @@ function MyApp({ Component, pageProps }) { return ( - {process.env.NEXT_PUBLIC_INDEX === "true" ? "" : } Date: Mon, 4 Dec 2023 15:57:45 -0300 Subject: [PATCH 2/5] update closeDate BDEdu --- next/pages/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next/pages/index.js b/next/pages/index.js index d629f6e6..ea4e6cf6 100644 --- a/next/pages/index.js +++ b/next/pages/index.js @@ -656,7 +656,7 @@ function Support({ pages }) { } function BDEdu () { - const closeDate = new Date(2024, 1, 5) + const closeDate = new Date(2024, 1, 6) const currentDate = new Date() if(currentDate > closeDate) return null From 80edac1aeaa1ac1214758e90a59aa16e92965e25 Mon Sep 17 00:00:00 2001 From: AldemirLucas Date: Tue, 5 Dec 2023 17:30:36 -0300 Subject: [PATCH 3/5] cd-dev att env --- .github/workflows/cd-dev.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd-dev.yaml b/.github/workflows/cd-dev.yaml index 038e8b9a..d30c34e4 100644 --- a/.github/workflows/cd-dev.yaml +++ b/.github/workflows/cd-dev.yaml @@ -68,7 +68,9 @@ jobs: limits: cpu: 500m memory: 1Gi - env: [] + env: + - name: "NEXT_PUBLIC_KEY_STRIPE" + value: "${{ secrets.NEXT_PUBLIC_KEY_STRIPE }}" envFrom: - secretRef: name: basedosdados-website-development From 0b211db1882466fb7b801375e490c7771860b5d2 Mon Sep 17 00:00:00 2001 From: Lessa <82185307+AldemirLucas@users.noreply.github.com> Date: Wed, 6 Dec 2023 09:04:55 -0300 Subject: [PATCH 4/5] ocult bdEdu --- next/pages/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next/pages/index.js b/next/pages/index.js index ea4e6cf6..00ca2fa3 100644 --- a/next/pages/index.js +++ b/next/pages/index.js @@ -703,7 +703,7 @@ export default function Home({ return ( - + {/* */} From 2298e60c3e22d2de3dc073f2d0b075ead6c72c8f Mon Sep 17 00:00:00 2001 From: Vinicius Aguiar Date: Fri, 19 Jan 2024 20:16:18 -0400 Subject: [PATCH 5/5] fix: update release and deploy actions (#739) --- .github/workflows/cd-staging.yaml | 10 +++++----- .github/workflows/cd.yaml | 2 +- .github/workflows/release-staging.yaml | 2 ++ .github/workflows/release.yaml | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd-staging.yaml b/.github/workflows/cd-staging.yaml index aec23559..367e6989 100644 --- a/.github/workflows/cd-staging.yaml +++ b/.github/workflows/cd-staging.yaml @@ -11,19 +11,19 @@ env: IMAGE_NAME: ghcr.io/basedosdados/website:staging jobs: - deploy-development: + deploy-staging: if: ${{ github.event.workflow_run.conclusion == 'success' }} || ${{ github.event_name == 'workflow_dispatch' }} - name: Deploy (Development) + name: Deploy (Staging) runs-on: ubuntu-latest environment: - name: development + name: staging url: https://staging.basedosdados.org steps: - name: Checkout uses: actions/checkout@v3.3.0 with: - ref: development + ref: staging - name: Import Secrets id: import_secrets @@ -60,7 +60,7 @@ jobs: name: "ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}" tag: "staging" pullPolicy: "Always" - replicas: 2 + replicas: 1 resources: requests: cpu: 100m diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index e4f9667f..2d2ee271 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -60,7 +60,7 @@ jobs: name: "ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}" tag: "production" pullPolicy: "Always" - replicas: 1 + replicas: 2 resources: requests: cpu: 100m diff --git a/.github/workflows/release-staging.yaml b/.github/workflows/release-staging.yaml index 46097b12..83a81dc3 100644 --- a/.github/workflows/release-staging.yaml +++ b/.github/workflows/release-staging.yaml @@ -18,6 +18,7 @@ jobs: NEXT_PORT: ${{ vars.NEXT_PORT }} NEXT_PUBLIC_API_URL: ${{ vars.NEXT_PUBLIC_API_URL }} NEXT_PUBLIC_SITE_NAME: ${{ vars.NEXT_PUBLIC_SITE_NAME }} + NEXT_PUBLIC_KEY_STRIPE: ${{ secrets.NEXT_PUBLIC_KEY_STRIPE }} NODE_ENV: ${{ vars.NODE_ENV }} IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:staging @@ -43,3 +44,4 @@ jobs: tags: ${{ env.IMAGE_NAME }} build-args: | NEXT_PUBLIC_API_URL=${{ env.NEXT_PUBLIC_API_URL }} + NEXT_PUBLIC_KEY_STRIPE=${{ env.NEXT_PUBLIC_KEY_STRIPE }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bc31b06e..f23e846b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,6 +18,7 @@ jobs: NEXT_PORT: ${{ vars.NEXT_PORT }} NEXT_PUBLIC_API_URL: ${{ vars.NEXT_PUBLIC_API_URL }} NEXT_PUBLIC_SITE_NAME: ${{ vars.NEXT_PUBLIC_SITE_NAME }} + NEXT_PUBLIC_KEY_STRIPE: ${{ secrets.NEXT_PUBLIC_KEY_STRIPE }} NODE_ENV: ${{ vars.NODE_ENV }} IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:production @@ -43,3 +44,4 @@ jobs: tags: ${{ env.IMAGE_NAME }} build-args: | NEXT_PUBLIC_API_URL=${{ env.NEXT_PUBLIC_API_URL }} + NEXT_PUBLIC_KEY_STRIPE=${{ env.NEXT_PUBLIC_KEY_STRIPE }}