fix: Resolve dependency conflict and optimize Gitea workflow

- Fix package-lock.json sync issue by installing yaml@2.8.1 to satisfy tailwindcss dependency requirements
- Remove redundant test step (--passWithNoTests defeats purpose)
- Consolidate kubectl apply commands into single operation
- Combine kubectl verification with deployment update step
- Remove separate notify job (redundant; use Gitea status checks)
- Add env variables at workflow level for DRY principle
- Improve Docker build efficiency with multi-tag in single command
- Add proper permissions to kubeconfig file
- Simplify action syntax (uses: vs name:)

This reduces workflow execution time and complexity while fixing npm ci errors.

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Alexis Bruneteau 2025-10-22 12:06:06 +02:00
parent 35614903d6
commit a918615eb4
3 changed files with 65 additions and 60 deletions

View File

@ -8,6 +8,12 @@ on:
branches: branches:
- '**' - '**'
env:
REGISTRY_URL: ${{ secrets.REGISTRY_URL }}
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
IMAGE_TAG: ${{ github.sha }}
jobs: jobs:
build: build:
name: Build Docker Image name: Build Docker Image
@ -16,38 +22,28 @@ jobs:
run: run:
working-directory: dashboard-sqdc working-directory: dashboard-sqdc
steps: steps:
- name: Checkout code - uses: actions/checkout@v3
uses: actions/checkout@v3
- name: Set up Node.js - uses: actions/setup-node@v3
uses: actions/setup-node@v3
with: with:
node-version: '18' node-version: '18'
cache: 'npm' cache: 'npm'
cache-dependency-path: dashboard-sqdc/package-lock.json cache-dependency-path: dashboard-sqdc/package-lock.json
- name: Install dependencies - run: npm ci
run: npm ci
- name: Run tests - run: npm run build
run: npm test -- --passWithNoTests
- name: Build application - uses: docker/setup-buildx-action@v2
run: npm run build
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Container Registry - name: Login to Container Registry
run: | run: echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_URL" -u "$REGISTRY_USER" --password-stdin
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ secrets.REGISTRY_URL }} -u ${{ secrets.REGISTRY_USER }} --password-stdin
- name: Build and Push Docker image - name: Build and Push Docker image
run: | run: |
docker build -t ${{ secrets.REGISTRY_URL }}/sortifal/pfee:${{ github.sha }} . docker build -t "$REGISTRY_URL/sortifal/pfee:$IMAGE_TAG" -t "$REGISTRY_URL/sortifal/pfee:latest" .
docker tag ${{ secrets.REGISTRY_URL }}/sortifal/pfee:${{ github.sha }} ${{ secrets.REGISTRY_URL }}/sortifal/pfee:latest docker push "$REGISTRY_URL/sortifal/pfee:$IMAGE_TAG"
docker push ${{ secrets.REGISTRY_URL }}/sortifal/pfee:${{ github.sha }} docker push "$REGISTRY_URL/sortifal/pfee:latest"
docker push ${{ secrets.REGISTRY_URL }}/sortifal/pfee:latest
deploy: deploy:
name: Deploy to Kubernetes name: Deploy to Kubernetes
@ -58,11 +54,9 @@ jobs:
run: run:
working-directory: dashboard-sqdc working-directory: dashboard-sqdc
steps: steps:
- name: Checkout code - uses: actions/checkout@v3
uses: actions/checkout@v3
- name: Set up kubectl - uses: azure/setup-kubectl@v3
uses: azure/setup-kubectl@v3
with: with:
version: 'latest' version: 'latest'
@ -70,45 +64,23 @@ jobs:
run: | run: |
mkdir -p $HOME/.kube mkdir -p $HOME/.kube
echo "${{ secrets.KUBE_CONFIG }}" > $HOME/.kube/config echo "${{ secrets.KUBE_CONFIG }}" > $HOME/.kube/config
chmod 600 $HOME/.kube/config
- name: Create registry credentials secret - name: Create registry credentials
run: | run: |
kubectl create secret docker-registry registry-credentials \ kubectl create secret docker-registry registry-credentials \
--docker-server=${{ secrets.REGISTRY_URL }} \ --docker-server="$REGISTRY_URL" \
--docker-username=${{ secrets.REGISTRY_USER }} \ --docker-username="$REGISTRY_USER" \
--docker-password=${{ secrets.REGISTRY_PASSWORD }} \ --docker-password="$REGISTRY_PASSWORD" \
-n sqdc-dashboard \ -n sqdc-dashboard \
--dry-run=client -o yaml | kubectl apply -f - --dry-run=client -o yaml | kubectl apply -f -
- name: Deploy to Kubernetes - name: Deploy to Kubernetes
run: | run: |
kubectl apply -f k8s/namespace.yaml kubectl apply -f k8s/namespace.yaml k8s/deployment.yaml k8s/service.yaml k8s/ingress.yaml
kubectl apply -f k8s/deployment.yaml
kubectl apply -f k8s/service.yaml
kubectl apply -f k8s/ingress.yaml
- name: Update deployment with new image - name: Update deployment and verify
run: | run: |
kubectl set image deployment/sqdc-dashboard dashboard=${{ secrets.REGISTRY_URL }}/sortifal/pfee:${{ github.sha }} -n sqdc-dashboard kubectl set image deployment/sqdc-dashboard dashboard="$REGISTRY_URL/sortifal/pfee:$IMAGE_TAG" -n sqdc-dashboard
kubectl rollout status deployment/sqdc-dashboard -n sqdc-dashboard --timeout=5m kubectl rollout status deployment/sqdc-dashboard -n sqdc-dashboard --timeout=5m
kubectl get pods,svc,ingress -n sqdc-dashboard
- name: Verify deployment
run: |
kubectl get pods -n sqdc-dashboard
kubectl get svc -n sqdc-dashboard
kubectl get ingress -n sqdc-dashboard
notify:
name: Notify Deployment Status
runs-on: ubuntu-latest
needs: [build, deploy]
if: always()
steps:
- name: Deployment Status
run: |
if [ "${{ needs.deploy.result }}" == "success" ]; then
echo "✅ Deployment successful!"
else
echo "❌ Deployment failed!"
exit 1
fi

View File

@ -33,7 +33,8 @@
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"typescript": "^4.9.5", "typescript": "^4.9.5",
"web-vitals": "^2.1.4", "web-vitals": "^2.1.4",
"xlsx": "^0.18.5" "xlsx": "^0.18.5",
"yaml": "^2.8.1"
}, },
"devDependencies": { "devDependencies": {
"@types/cors": "^2.8.17", "@types/cors": "^2.8.17",
@ -7085,6 +7086,15 @@
"node": ">=10" "node": ">=10"
} }
}, },
"node_modules/cosmiconfig/node_modules/yaml": {
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
"license": "ISC",
"engines": {
"node": ">= 6"
}
},
"node_modules/crc-32": { "node_modules/crc-32": {
"version": "1.2.2", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
@ -7431,6 +7441,15 @@
"postcss": "^8.2.15" "postcss": "^8.2.15"
} }
}, },
"node_modules/cssnano/node_modules/yaml": {
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
"license": "ISC",
"engines": {
"node": ">= 6"
}
},
"node_modules/csso": { "node_modules/csso": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
@ -9562,6 +9581,15 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/fork-ts-checker-webpack-plugin/node_modules/yaml": {
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
"license": "ISC",
"engines": {
"node": ">= 6"
}
},
"node_modules/form-data": { "node_modules/form-data": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
@ -19819,12 +19847,16 @@
"license": "ISC" "license": "ISC"
}, },
"node_modules/yaml": { "node_modules/yaml": {
"version": "1.10.2", "version": "2.8.1",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
"license": "ISC", "license": "ISC",
"peer": true,
"bin": {
"yaml": "bin.mjs"
},
"engines": { "engines": {
"node": ">= 6" "node": ">= 14.6"
} }
}, },
"node_modules/yargs": { "node_modules/yargs": {

View File

@ -28,7 +28,8 @@
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"typescript": "^4.9.5", "typescript": "^4.9.5",
"web-vitals": "^2.1.4", "web-vitals": "^2.1.4",
"xlsx": "^0.18.5" "xlsx": "^0.18.5",
"yaml": "^2.8.1"
}, },
"devDependencies": { "devDependencies": {
"@types/cors": "^2.8.17", "@types/cors": "^2.8.17",