From 4c2265cde6ad2235493e797f644e183a1cd3090a Mon Sep 17 00:00:00 2001 From: Vezpi Date: Mon, 30 Mar 2026 09:29:42 +0000 Subject: [PATCH 1/6] fix: revert to git clone instead of checkout --- .gitea/workflows/test.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index c2b25c9..c9c4ff1 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -23,10 +23,7 @@ jobs: docker_folder_changed: ${{ steps.docker_folder.outputs.changed }} steps: - name: Checkout Repository - uses: actions/checkout@v4 - with: - ref: ${{ gitea.ref_name }} - token: ${{ secrets.REPO_TOKEN }} + run: git clone --branch ${{ gitea.ref_name }} https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git . - name: Check Latest Hugo Version id: get_latest @@ -81,10 +78,7 @@ jobs: shell: sh steps: - name: Checkout Repository - uses: actions/checkout@v4 - with: - ref: ${{ gitea.ref_name }} - token: ${{ secrets.REPO_TOKEN }} + run: git clone --branch ${{ gitea.ref_name }} https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git . - name: Build Docker Image run: | -- 2.49.1 From a1253eb40bd643580178b2f817cbf879a96dc653 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Fri, 3 Apr 2026 08:44:17 +0000 Subject: [PATCH 2/6] change: dev become staging, test become dev --- .gitea/workflows/deployment.yml | 2 +- .gitea/workflows/test.yml | 2 +- themes/stack | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index 1f4c691..cb9c0e9 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -116,7 +116,7 @@ jobs: needs: Deploy-Staging runs-on: ubuntu env: - URL: "https://blog-dev.vezpi.com/en/" + URL: "https://blog-staging.vezpi.com/en/" steps: - name: Check HTTP Response run: | diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index c9c4ff1..57d54d9 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -117,7 +117,7 @@ jobs: needs: Deploy-Test runs-on: ubuntu env: - URL: "https://blog-test.vezpi.com/en/" + URL: "https://blog-dev.vezpi.com/en/" steps: - name: Check HTTP Response run: | diff --git a/themes/stack b/themes/stack index 8e36874..9e6b7b2 160000 --- a/themes/stack +++ b/themes/stack @@ -1 +1 @@ -Subproject commit 8e3687431f40f3367635f067b3be89bd3f95d36e +Subproject commit 9e6b7b22a9d47478a72287bcdc29e885dcd8f359 -- 2.49.1 From b1590f913ca015908b368ee83dda9a0d239a4b0f Mon Sep 17 00:00:00 2001 From: Vezpi Date: Fri, 3 Apr 2026 09:14:34 +0000 Subject: [PATCH 3/6] change: preview by gitea.ref_name --- .gitea/workflows/deployment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index cb9c0e9..f07c144 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -24,7 +24,7 @@ jobs: docker_folder_changed: ${{ steps.docker_folder.outputs.changed }} steps: - name: Checkout Repository - run: git clone --branch preview https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git . + run: git clone --branch ${{ gitea.ref_name }} https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git . - name: Check Latest Hugo Version id: get_latest @@ -79,7 +79,7 @@ jobs: shell: sh steps: - name: Checkout Repository - run: git clone --branch preview https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git . + run: git clone --branch ${{ gitea.ref_name }} https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git . - name: Build Docker Image run: | @@ -143,7 +143,7 @@ jobs: - name: Merge preview Branch on main run: | - git merge --ff-only origin/preview + git merge --ff-only origin/${{ gitea.ref_name }} git push origin main Deploy-Production: -- 2.49.1 From 18b5de42bb426f09df6dbbe400ada81e271d0345 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Fri, 3 Apr 2026 09:28:48 +0000 Subject: [PATCH 4/6] update: URL of dev instance --- .gitea/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 57d54d9..f2ab181 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -102,7 +102,7 @@ jobs: run: shell: sh env: - CONTAINER_NAME: blog_test + CONTAINER_NAME: blog_dev steps: - name: Launch Blog Test Deployment run: | -- 2.49.1 From fa75e5a9a6e1d1b3589dc93303083c04ff679af9 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Fri, 3 Apr 2026 09:30:41 +0000 Subject: [PATCH 5/6] update: docker tag for dev --- .gitea/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index f2ab181..1ce54aa 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -87,7 +87,7 @@ jobs: --build-arg HUGO_VERSION=${{ needs.Check-Rebuild.outputs.latest_hugo_version }} \ --tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} \ . - docker tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} ${DOCKER_IMAGE}:test + docker tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} ${DOCKER_IMAGE}:dev Deploy-Test: needs: -- 2.49.1 From 59719bf8ffd4adb6fddc06e1c84457b7fcd08311 Mon Sep 17 00:00:00 2001 From: Vezpi Date: Fri, 3 Apr 2026 10:48:00 +0000 Subject: [PATCH 6/6] update: themes/stack commit version --- themes/stack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/stack b/themes/stack index 9e6b7b2..8e36874 160000 --- a/themes/stack +++ b/themes/stack @@ -1 +1 @@ -Subproject commit 9e6b7b22a9d47478a72287bcdc29e885dcd8f359 +Subproject commit 8e3687431f40f3367635f067b3be89bd3f95d36e -- 2.49.1