From ab36e5e3d161d98b7efae78f7eaf16ad1ffd7c92 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Sun, 13 Apr 2025 14:48:07 +0200 Subject: [PATCH 1/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f3a269ee..19fec3db 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,7 +44,7 @@ This project follows a Fork/Feature Branch/Pull Request model. If you're not fam ```bash git push -u origin feature/your-feature-name ``` -9. **Create a pull request**: Propose your changes **to the dev branch**. +9. **Create a pull request**: Propose your changes **to the main branch**. # Need Help? From 1769054b7ce5437e4a426edf2a10b50d35f76f57 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Sun, 13 Apr 2025 16:09:22 +0200 Subject: [PATCH 2/7] Rename dependabot to Dependabot.yml --- .github/{dependabot => Dependabot.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{dependabot => Dependabot.yml} (100%) diff --git a/.github/dependabot b/.github/Dependabot.yml similarity index 100% rename from .github/dependabot rename to .github/Dependabot.yml From ea2c271ccffe601c9d99db84afead2505c80d7f4 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 14 Apr 2025 00:30:11 +0200 Subject: [PATCH 3/7] Create pr-docker-build.yml --- .github/pr-docker-build.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/pr-docker-build.yml diff --git a/.github/pr-docker-build.yml b/.github/pr-docker-build.yml new file mode 100644 index 00000000..50bba361 --- /dev/null +++ b/.github/pr-docker-build.yml @@ -0,0 +1,30 @@ +name: Build and Publish PR Docker Image + +on: + pull_request: + types: [opened, synchronize] + +jobs: + build-and-publish: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ github.token }} + + - name: Set image tag + id: vars + run: echo "IMAGE_TAG=ghcr.io/gitroomhq/postiz-app-pr:${{ github.event.pull_request.number }}" >> $GITHUB_ENV + + - name: Build Docker image from Dockerfile.dev + run: docker build -f Dockerfile.dev -t $IMAGE_TAG . + + - name: Push Docker image to GHCR + run: docker push $IMAGE_TAG From 4a0cb78c9016eae56f05e59b38bd11050ccec60d Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 14 Apr 2025 00:31:25 +0200 Subject: [PATCH 4/7] Delete .github/pr-docker-build.yml --- .github/pr-docker-build.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 .github/pr-docker-build.yml diff --git a/.github/pr-docker-build.yml b/.github/pr-docker-build.yml deleted file mode 100644 index 50bba361..00000000 --- a/.github/pr-docker-build.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Build and Publish PR Docker Image - -on: - pull_request: - types: [opened, synchronize] - -jobs: - build-and-publish: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ github.token }} - - - name: Set image tag - id: vars - run: echo "IMAGE_TAG=ghcr.io/gitroomhq/postiz-app-pr:${{ github.event.pull_request.number }}" >> $GITHUB_ENV - - - name: Build Docker image from Dockerfile.dev - run: docker build -f Dockerfile.dev -t $IMAGE_TAG . - - - name: Push Docker image to GHCR - run: docker push $IMAGE_TAG From b97aa4a75146d6aeaa2966a83915e7980efd49a7 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 14 Apr 2025 00:32:12 +0200 Subject: [PATCH 5/7] Create pr-docker-build.yml --- .github/workflows/pr-docker-build.yml | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/pr-docker-build.yml diff --git a/.github/workflows/pr-docker-build.yml b/.github/workflows/pr-docker-build.yml new file mode 100644 index 00000000..50bba361 --- /dev/null +++ b/.github/workflows/pr-docker-build.yml @@ -0,0 +1,30 @@ +name: Build and Publish PR Docker Image + +on: + pull_request: + types: [opened, synchronize] + +jobs: + build-and-publish: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ github.token }} + + - name: Set image tag + id: vars + run: echo "IMAGE_TAG=ghcr.io/gitroomhq/postiz-app-pr:${{ github.event.pull_request.number }}" >> $GITHUB_ENV + + - name: Build Docker image from Dockerfile.dev + run: docker build -f Dockerfile.dev -t $IMAGE_TAG . + + - name: Push Docker image to GHCR + run: docker push $IMAGE_TAG From c7a49620a65749e95b70d6f4f79545b03ea56142 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 14 Apr 2025 00:48:33 +0200 Subject: [PATCH 6/7] Update Jenkinsfile --- Jenkinsfile | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3111f18d..2ed2011e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,23 +6,6 @@ pipeline { } stages { - stage('Fetch Cache') { - options { - cache(caches: [ - arbitraryFileCache( - cacheName: 'Next', - cacheValidityDecidingFile: '', - excludes: '', - includes: '**/*', - path: "./.nx/cache" - ) - ], defaultBranch: 'dev', maxCacheSize: 256000, skipSave: true) - } - steps { - echo 'Start fetching Cache.' - } - } - stage('Checkout Repository') { steps { checkout scm @@ -56,24 +39,6 @@ pipeline { } } - stage('Save Cache') { - options { - cache(caches: [ - arbitraryFileCache( - cacheName: 'Next', - cacheValidityDecidingFile: '', - excludes: '', - includes: '**/*', - path: "./.nx/cache" - ) - ], defaultBranch: 'dev', maxCacheSize: 256000, skipRestore: true) - } - steps { - echo 'Start saving Cache.' - } - } - } - post { always { junit '**/reports/junit.xml' From a063561406edf78a786024309b254e42db001a45 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 14 Apr 2025 00:53:59 +0200 Subject: [PATCH 7/7] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2ed2011e..75c1ce0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,7 @@ pipeline { sh 'npm run build 2>&1 | tee build_report.log' // Captures build output } } - + } post { always { junit '**/reports/junit.xml'