Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
95918e0
Merge pull request #105 from odimsom/dev
odimsom May 17, 2026
3c11a49
Merge pull request #106 from odimsom/qa
odimsom May 17, 2026
bcbe65b
chore(deps): bump nodemailer in /notification-service
dependabot[bot] May 17, 2026
50d8cc8
chore(deps-dev): bump hono in /frontend/web-admin
dependabot[bot] May 17, 2026
1f7cd0e
Merge pull request #116 from odimsom/dependabot/npm_and_yarn/frontend…
odimsom May 17, 2026
84a7765
Merge pull request #115 from odimsom/dependabot/npm_and_yarn/notifica…
odimsom May 17, 2026
349d8ea
Merge pull request #122 from odimsom/dev
odimsom May 17, 2026
a2b22d6
chore(deps-dev): bump postcss in /frontend/web-admin (#118)
dependabot[bot] May 17, 2026
c0ef4d8
chore(deps): bump ip-address and express-rate-limit (#119)
dependabot[bot] May 17, 2026
c368485
chore(deps-dev): bump @hono/node-server in /frontend/web-admin (#120)
dependabot[bot] May 17, 2026
36ca76b
chore(deps-dev): bump @xmldom/xmldom in /frontend/web-admin (#121)
dependabot[bot] May 17, 2026
a1a439f
Merge pull request #123 from odimsom/qa
odimsom May 17, 2026
61f6e1a
chore(deps): bump the docker-images group with 2 updates (#124)
dependabot[bot] May 17, 2026
e4e8680
chore(deps): bump mongoose in /scripts in the scripts-deps group (#126)
dependabot[bot] May 17, 2026
a4eaf39
chore(deps-dev): bump the frontend-root group (#129)
dependabot[bot] May 17, 2026
b847de4
chore(deps): bump the notification-deps group (#134)
dependabot[bot] May 17, 2026
c5e0392
chore(deps): bump the actions group with 13 updates (#137)
dependabot[bot] May 17, 2026
c03d1c1
chore(deps): bump the auth-prod group in /auth with 2 updates (#138)
dependabot[bot] May 17, 2026
b3bbef5
chore(deps): bump the angular group (#139)
dependabot[bot] May 17, 2026
dfa254f
chore(deps-dev): bump the tailwind group (#140)
dependabot[bot] May 17, 2026
9fc2a9e
chore(deps-dev): bump @playwright/test (#141)
dependabot[bot] May 17, 2026
196e771
chore(deps): bump the landing-deps group (#142)
dependabot[bot] May 17, 2026
b4cacff
Bump the ef-core group with 7 updates (#146)
dependabot[bot] May 17, 2026
7ac5b0e
chore(deps): bump aspnet group - Microsoft.Extensions.Configuration/H…
dependabot[bot] May 17, 2026
24dde83
chore(deps): bump testing group - FluentAssertions, Test.Sdk, xunit r…
dependabot[bot] May 17, 2026
a0ef989
chore(deps): bump redis in /services/reports-service (#125)
dependabot[bot] May 17, 2026
81ecdcb
chore(deps): bump tower-http in /services/reports-service (#127)
dependabot[bot] May 17, 2026
e889314
chore(deps): bump axum from 0.7.9 to 0.8.9 in /services/catalog-servi…
dependabot[bot] May 17, 2026
5ac07a8
chore(deps): bump axum from 0.7.9 to 0.8.9 in /services/reports-servi…
dependabot[bot] May 17, 2026
1b76aee
chore(deps): bump redis in /services/catalog-service (#131)
dependabot[bot] May 17, 2026
6c9aa70
chore(deps): bump tower in /services/catalog-service (#133)
dependabot[bot] May 17, 2026
8426c8e
chore(deps): bump thiserror in /services/catalog-service (#135)
dependabot[bot] May 17, 2026
eb2c2df
chore(deps-dev): bump the auth-dev group in /auth with 4 updates (#143)
dependabot[bot] May 17, 2026
e0916bf
chore(deps-dev): bump the other-frontend group in /frontend/web-admin…
dependabot[bot] May 17, 2026
5343f54
chore(deps-dev): bump jsdom from 28.1.0 to 29.1.1 in /frontend/web-ad…
dependabot[bot] May 17, 2026
dd53215
chore(deps): bump path-to-regexp from 8.3.0 to 8.4.2 in /auth (#149)
dependabot[bot] May 17, 2026
4b71d08
chore(deps): bump brace-expansion from 1.1.12 to 2.1.0 in /auth (#150)
dependabot[bot] May 17, 2026
b20f76a
fix(deps): downgrade tailwindcss to v3, bump prometheus and tower-htt…
odimsom May 17, 2026
7215d60
fix(web-admin): downgrade tailwindcss/daisyui back to v3/v4 compat (#…
odimsom May 17, 2026
dced382
fix(devops): redirect devops.tucolmadord.com root to /grafana/
May 17, 2026
93742b2
actualizaciones de varias
May 19, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/cd-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Deploy to Production
runs-on: self-hosted
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Execute deployment script
run: |
Expand All @@ -37,7 +37,7 @@ jobs:
outputs:
tag_name: ${{ steps.vars.outputs.tag_name }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Resolve version
id: vars
Expand Down Expand Up @@ -76,17 +76,17 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout monorepo
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
submodules: recursive

- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '22'

- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.x'

Expand All @@ -108,7 +108,7 @@ jobs:
shell: pwsh

- name: Attach installer to GitHub Release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
tag_name: ${{ needs.release.outputs.tag_name }}
prerelease: false
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-dev-to-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
name: Unit Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.x'

Expand All @@ -26,7 +26,7 @@ jobs:
dotnet test TuColmadoRD.slnx -c Release --no-build --verbosity normal

- name: Setup Node
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '22'

Expand All @@ -46,7 +46,7 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Create and Merge PR to QA
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-qa-to-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
name: Integration Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.x'

Expand All @@ -26,7 +26,7 @@ jobs:
dotnet test TuColmadoRD.slnx -c Release --no-build --verbosity normal

- name: Setup Node
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '22'

Expand All @@ -46,7 +46,7 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Create and Merge PR to Main
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/ci-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
reports: ${{ github.event_name == 'workflow_dispatch' || steps.filter.outputs.reports }}
swarm: ${{ github.event_name == 'workflow_dispatch' || steps.filter.outputs.swarm }}
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v3
- uses: actions/checkout@v6
- uses: dorny/paths-filter@v4
id: filter
with:
filters: |
Expand All @@ -61,10 +61,10 @@ jobs:
run:
working-directory: services/catalog-service
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Cache Cargo
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
~/.cargo/registry
Expand All @@ -90,10 +90,10 @@ jobs:
run:
working-directory: services/reports-service
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Cache Cargo
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
~/.cargo/registry
Expand Down Expand Up @@ -124,11 +124,11 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set image metadata
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_ORG }}/catalog-service
tags: |
Expand All @@ -137,17 +137,17 @@ jobs:
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}

- name: Log in to GHCR
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Build and push catalog-service
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: services/catalog-service
push: true
Expand All @@ -166,11 +166,11 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set image metadata
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_ORG }}/reports-service
tags: |
Expand All @@ -179,17 +179,17 @@ jobs:
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}

- name: Log in to GHCR
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Build and push reports-service
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: services/reports-service
push: true
Expand All @@ -211,10 +211,10 @@ jobs:
runs-on: ubuntu-latest
environment: production
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Copy Swarm configs to VPS
uses: appleboy/scp-action@v0.1.7
uses: appleboy/scp-action@v1.0.0
with:
host: ${{ secrets.VPS_HOST }}
username: ${{ secrets.VPS_USER }}
Expand All @@ -224,7 +224,7 @@ jobs:
strip_components: 2

- name: Deploy via SSH
uses: appleboy/ssh-action@v1.0.3
uses: appleboy/ssh-action@v1.2.5
with:
host: ${{ secrets.VPS_HOST }}
username: ${{ secrets.VPS_USER }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:

steps:
- name: Checkout monorepo
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Setup Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v6
with:
node-version: '22'

Expand Down Expand Up @@ -76,14 +76,14 @@ jobs:
shell: pwsh

- name: Upload installer artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: installer-${{ steps.vars.outputs.app_version }}
path: backend/publish/installer/*.exe
if-no-files-found: error

- name: Create GitHub prerelease
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
tag_name: ${{ github.ref_name }}
name: TuColmadoRD ${{ github.ref_name }} - Test Release
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Run: docker run -p 5032:5032 -e DB_HOST=... tucolmadord

# ─── Stage 1: Build .NET gateway and API ──────────────────────────────────────
FROM mcr.microsoft.com/dotnet/sdk:10.0-preview AS build
FROM mcr.microsoft.com/dotnet/sdk:11.0-preview AS build
WORKDIR /source

# Copy solution and all project files first for layer caching
Expand All @@ -29,7 +29,7 @@ RUN dotnet publish backend/src/Presentations/TuColmadoRD.ApiGateway/TuColmadoRD.
-c Release -o /app/gateway

# ─── Stage 2: Runtime image ───────────────────────────────────────────────────
FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:11.0-preview AS runtime
WORKDIR /app

RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
Expand Down
4 changes: 2 additions & 2 deletions auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"dependencies": {
"bcryptjs": "^3.0.3",
"cors": "^2.8.6",
"dotenv": "^17.3.1",
"dotenv": "^17.4.2",
"express": "^5.2.1",
"helmet": "^8.1.0",
"jsonwebtoken": "^9.0.3",
"mongoose": "^9.3.2",
"mongoose": "^9.6.2",
"swagger-jsdoc": "^6.2.8",
"swagger-ui-express": "^5.0.1"
},
Expand Down
Loading
Loading