From 631db83595fbb157aa1c19a39177fb9977f7cdfe Mon Sep 17 00:00:00 2001 From: Nevo David Date: Mon, 14 Apr 2025 10:33:43 +0700 Subject: [PATCH 1/5] feat: view invoices from stripe portal --- .../src/components/billing/main.billing.component.tsx | 2 +- .../nestjs-libraries/src/services/stripe.service.ts | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/apps/frontend/src/components/billing/main.billing.component.tsx b/apps/frontend/src/components/billing/main.billing.component.tsx index f51befba..811d8b4d 100644 --- a/apps/frontend/src/components/billing/main.billing.component.tsx +++ b/apps/frontend/src/components/billing/main.billing.component.tsx @@ -506,7 +506,7 @@ export const MainBillingComponent: FC<{ {!!subscription?.id && (
- + {isGeneral && !subscription?.cancelAt && ( ) : ( - + )}
From c88a4347d75d7eab84026cc2e750cb9aca4d49ec Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 14 Apr 2025 18:21:24 +0200 Subject: [PATCH 3/5] Update version.txt --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index cbec0de0..f90a7b3c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v1.38.1 +v1.39.1 From 8c4738f12d97fe4d8d09bdd292179a0cede09c05 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 14 Apr 2025 19:14:16 +0200 Subject: [PATCH 4/5] Update Jenkinsfile --- Jenkinsfile | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 57d6bf97..dbcac16e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,6 +3,7 @@ pipeline { environment { NODE_VERSION = '20.17.0' + PR_NUMBER = "${env.CHANGE_ID}" // PR number comes from webhook payload } stages { @@ -32,6 +33,38 @@ pipeline { sh 'npm run build' } } + + stage('Build and Push Docker Image') { + when { + expression { return env.CHANGE_ID != null } // Only run if it's a PR + } + steps { + withCredentials([string(credentialsId: 'gh-pat', variable: 'GITHUB_PASS')]) { + + // Docker login step + sh ''' + echo "$GITHUB_PASS" | docker login ghcr.io -u "egelhaus" --password-stdin + ''' + + // Set image tag dynamically based on the PR number + sh ''' + IMAGE_TAG="ghcr.io/gitroomhq/postiz-app-pr:$PR_NUMBER" + echo "IMAGE_TAG=$IMAGE_TAG" >> image.env + ''' + + // Build Docker image + sh ''' + source image.env + docker build -f Dockerfile.dev -t $IMAGE_TAG . + ''' + + // Push Docker image to GitHub Container Registry + sh ''' + source image.env + docker push $IMAGE_TAG + ''' + } + } } post { success { From f92a24e052465980b89ca996204d7a89db47697c Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 14 Apr 2025 19:23:29 +0200 Subject: [PATCH 5/5] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index dbcac16e..782c32d4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,6 +65,7 @@ pipeline { ''' } } + } } post { success {