Merge pull request 'This is not the commit message you are looking for' (#2) from deployments into master

Reviewed-on: Siteworxpro/reloading-manager#2

.gitea/workflows/build.yml

@@ -1,7 +1,7 @@
 on:
   push:
     tags:
-      - '**'
+      - 'v*'
 
 name: 🏗️ ✨ Build Workflow
 
@@ -25,13 +25,13 @@ jobs:
       - name: 🔑 🔐 Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
+          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: 🔑 🛠️ Login to Siteworx Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.SITEWORX_USERNAME }}
+          username: ${{ secrets.SITEWORX_USERNAME }}
           password: ${{ secrets.SITEWORX_PASSWORD }}
           registry: scr.siteworxpro.com
 
@@ -77,13 +77,13 @@ jobs:
       - name: 🔑 🔐 Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
+          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: 🔑 🛠️ Login to Siteworx Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.SITEWORX_USERNAME }}
+          username: ${{ secrets.SITEWORX_USERNAME }}
           password: ${{ secrets.SITEWORX_PASSWORD }}
           registry: scr.siteworxpro.com
 
@@ -127,16 +127,23 @@ jobs:
         run: |
           echo "## Do not edit this file directly. It is auto-generated by the script." > argocd/deployment/deployment.yml
           sed "s|__TAG__|${{ gitea.ref_name }}|g" argocd/template/deployment.yml >> argocd/deployment/deployment.yml
-
+#
-      - name: 💾✅ Commit Updated Manifest
+#      - name: 💾 ✅ Commit Updated Manifest
-        uses: EndBug/add-and-commit@v9
+#        uses: EndBug/add-and-commit@v9
-        with:
+#        with:
-          new_branch: release/${{ gitea.ref_name }}-deploy
+#          new_branch: release/${{ gitea.ref_name }}-deploy
-          add: argocd/deployment/deployment.yml
+#          add: argocd/deployment/deployment.yml
-          author_name: "GitHub Action 🤖"
+#          author_name: "GitHub Action 🤖"
-          author_email: gitia@siteworxpro.com
+#          author_email: gitia@siteworxpro.com
-          message: "📝🔄 Update deployment manifest with new image tags"
+#          message: "📝 🔄 Update deployment manifest with new image tags"
 
       - name: 🚀 ✨ Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v7
+        with:
+          base: master
+          add-paths: argocd/deployment/deployment.yml
+          title: "🚀 ✨ Release ${GITHUB_REF_NAME} - Deploy"
+          branch: release/${{ gitea.ref_name }}-deploy
+          committer: "Gitea Action 🤖 <gitia@siteworxpro.com>"
+          body: "📝 🔄 Update deployment manifest with new image tags for release ${GITHUB_REF_NAME}"

.gitea/workflows/tests.yml

@@ -1,4 +1,10 @@
 on:
+  workflow_dispatch:
+    inputs:
+      test:
+          description: 'Run tests'
+          required: true
+          default: 'true'
   push:
     branches:
       - "*"
@@ -47,7 +53,7 @@ jobs:
       - name: ⚙️ 🐹 Set up Go Environment
         uses: actions/setup-go@v2
         with:
-          go-version: '1.24.0'
+          go-version: '1.24.3'
           cache: true
       - name: 📖 🔍 Checkout Repository Code
         uses: actions/checkout@v2

.gitlab-ci.yml

@@ -4,12 +4,16 @@ stages:
   - Update Deployment
   - Create Commit
   - Create Merge Request
+  - Trigger
 
 NodeJs Tests:
   stage: Tests
   image: node:22.14.0
-  except:
+  rules:
-    - tags
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - frontend/**
+        - frontend/.gitlab-ci.yml
   before_script:
     - cd frontend
     - npm install
@@ -20,6 +24,11 @@ include:
   - project: 'shared/blueprints'
     file: 'jobs/golang-tests.yml'
     ref: master
+    rules:
+      - if: '$CI_PIPELINE_SOURCE == "push"'
+        changes:
+          - backend/**
+          - backend/.gitlab-ci.yml
     inputs:
       job_name: "Go Tests"
       working_directory: "backend"
@@ -61,6 +70,18 @@ include:
       context: "frontend"
       dockerfile: "frontend/Dockerfile"
 
+  - project: 'shared/blueprints'
+    file: 'jobs/trigger-argocd.yml'
+    ref: master
+    rules:
+      - changes:
+          - argocd/**/*
+    inputs:
+      stage: Trigger
+      argocdServer: ${ARGOCD_SERVER}
+      argocdAuthToken: ${ARGOCD_AUTH_TOKEN}
+      argocdAppName: ${ARGOCD_APP_NAME}
+
 Update Deployment:
   image: siteworxpro/alpine:3.21.3
   rules:
@@ -84,7 +105,7 @@ Create Commit:
     - Update Deployment
   image: siteworxpro/git:2.49.0
   before_script: |
-    git config --global user.name "${GITLAB_USER_NAME}"
+    git config --global user.name "${GITLAB_USER_NAME} via Gitlab Runner"
     git config --global user.email "${GITLAB_USER_EMAIL}"
   script: |
     git pull origin master 
@@ -107,7 +128,8 @@ Create Merge Request:
     curl --request POST --header "PRIVATE-TOKEN: glpat-hv-uxCx3PDNKn7ihyXce" \
       --data "source_branch=update-deployment-${CI_COMMIT_TAG}" \
       --data "target_branch=master" \
-      --data "title=Update deployment manifest with new image tags" \
+      --data "title=Update deployment manifest for version ${CI_COMMIT_TAG}" \
       --data "description=This merge request updates the deployment manifest with the new image tags." \
       --data "remove_source_branch=true" \
+      --data "squash_commits=true" \
       "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/merge_requests"

argocd/deployment/deployment.yml

@@ -19,11 +19,11 @@ spec:
         - name: siteworxpro
       containers:
         - name: frontend
-          image: scr.siteworxpro.com/reloading-manager/frontend:v0.0.26
+          image: scr.siteworxpro.com/reloading-manager/frontend:v0.0.29
           ports:
             - containerPort: 80
         - name: backend
-          image: scr.siteworxpro.com/reloading-manager/backend:v0.0.26
+          image: scr.siteworxpro.com/reloading-manager/backend:v0.0.29
           ports:
             - containerPort: 8080
           envFrom:

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM siteworxpro/golang:1.24.0 AS build
+FROM siteworxpro/golang:1.24.3 AS build
 
 WORKDIR /app
 

backend/go.mod

@@ -1,6 +1,6 @@
 module git.siteworxpro.com/reloading-manager/backend
 
-go 1.24.0
+go 1.24.3
 
 require (
 	git.siteworxpro.com/packages/go/utilities v1.3.0