diff --git a/.env.development b/.env.development index fe6037e..ea961cd 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_USE_CGI=false # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.860 +NEXT_PUBLIC_APP_VERSION=1.6.861 NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) diff --git a/.env.production b/.env.production index c9bc30e..87c1449 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_USE_CGI=true # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.860 +NEXT_PUBLIC_APP_VERSION=1.6.861 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6406556..220a2d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.861] – 2025-09-08 + +- test: Jenkinsfile + +--- ## [1.6.860] – 2025-09-08 - fix: Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile index 32cdb56..3a14cc0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,13 +1,7 @@ pipeline { - //test 1 - // Nutze das gleiche Playwright-Image wie Woodpecker für Parität - agent { - docker { - image 'mcr.microsoft.com/playwright:v1.54.2-jammy' - // root erlaubt playwright install (falls nötig) - args '-u 0:0' - } - } + // Fallback Variante ohne Docker-Plugin (agent any) + agent any + tools { nodejs 'node20' } options { timestamps() } @@ -24,30 +18,32 @@ pipeline { stages { stage('Self-check Jenkinsfile version') { steps { - sh '''#!/bin/bash -set -euo pipefail + sh ''' +set -eu echo '==== Showing first lines of Jenkinsfile (debug) ====' head -n 40 Jenkinsfile || true echo 'Git commit:' git rev-parse --short HEAD || true - ''' +uname -a || true +which node || true + ''' } } stage('Versions') { steps { - sh '''#!/bin/bash -set -euo pipefail + sh ''' +set -eu node -v && npm -v npx playwright --version || true - ''' + ''' } } stage('Verify mocks') { steps { - sh '''#!/bin/bash -set -euo pipefail + sh ''' +set -eu echo "[Verify mocks] working dir: $(pwd)" node -v && npm -v echo "HUSKY=$HUSKY" @@ -57,7 +53,7 @@ git ls-files | grep -i '^mocks/device-cgi-simulator/SERVICE/systemMockData.js' | echo "=== ls -la ===" ls -la mocks/device-cgi-simulator/SERVICE || true echo "=== file exists? ===" -if [[ -f mocks/device-cgi-simulator/SERVICE/systemMockData.js ]]; then +if [ -f mocks/device-cgi-simulator/SERVICE/systemMockData.js ]; then echo 'FOUND' else echo 'MISSING'; exit 1 @@ -68,37 +64,33 @@ fi stage('Build') { steps { - sh '''#!/bin/bash -set -euo pipefail + sh ''' +set -eu env npm_config_production=false npm ci npm run build - ''' + ''' } } stage('E2E chromium') { steps { - sh '''#!/bin/bash -set -euo pipefail + sh ''' +set -eu echo 'Start simulator' npm run server:sim & SIM_PID=$! -cleanup() { - echo 'Stopping simulator' - kill $SIM_PID 2>/dev/null || true -} -trap cleanup EXIT +trap 'echo Stopping simulator; kill $SIM_PID 2>/dev/null || true' EXIT echo 'Waiting for http://localhost:3000' node -e "const http=require('http');let n=120;function ping(){http.get('http://localhost:3000',res=>{console.log('Server is up');process.exit(0)}).on('error',()=>{if(n--<=0){console.error('Server did not start');process.exit(1)}setTimeout(ping,1000)});}ping();" -# Browser (Image hat sie normalerweise schon) -npx playwright install --with-deps chromium || true +# Playwright Browser installieren (best-effort) +npx playwright install chromium || true echo 'Run tests (chromium)' npx playwright test --project=chromium - ''' + ''' } } } diff --git a/package-lock.json b/package-lock.json index d5dd70f..b1508af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.860", + "version": "1.6.861", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.860", + "version": "1.6.861", "dependencies": { "@fontsource/roboto": "^5.1.0", "@headlessui/react": "^2.2.4", diff --git a/package.json b/package.json index d9384c4..db416a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.860", + "version": "1.6.861", "private": true, "scripts": { "dev": "next dev -p 3000",