diff --git a/.github/workflows/build-deploy-moonweb.yml b/.github/workflows/build-deploy-moonweb.yml index 43ed77c..5ad9405 100644 --- a/.github/workflows/build-deploy-moonweb.yml +++ b/.github/workflows/build-deploy-moonweb.yml @@ -43,15 +43,15 @@ jobs: - name: Validate build output run: | echo "Build output:" - find dist -maxdepth 2 -type f | sort | head -40 + find dist/moonweb -maxdepth 2 -type f | sort | head -40 echo "..." echo "Total files:" - find dist -type f | wc -l + find dist/moonweb -type f | wc -l # Verify key directories exist for dir in "" infra smarthome code retro timecapsule; do - if [ -n "$dir" ] && [ ! -d "dist/$dir" ]; then - echo "Error: dist/$dir not found" + if [ -n "$dir" ] && [ ! -d "dist/moonweb/$dir" ]; then + echo "Error: dist/moonweb/$dir not found" exit 1 fi done @@ -60,7 +60,7 @@ jobs: uses: actions/upload-artifact@v7 with: name: dist-moonweb - path: dist/ + path: dist/moonweb retention-days: 7 deploy: @@ -73,12 +73,12 @@ jobs: uses: actions/download-artifact@v8 with: name: dist-moonweb - path: dist/ + path: dist/moonweb - name: Deploy via SFTP uses: wlixcc/SFTP-Deploy-Action@v1.2.6 with: - local_path: './dist/*' + local_path: './dist/moonweb/*' server: ${{ secrets.IONOS_SFTP_HOST }} username: ${{ secrets.IONOS_SFTP_USER }} password: ${{ secrets.IONOS_SFTP_PASSWORD }} @@ -99,7 +99,7 @@ jobs: if [ "${{ needs.deploy.result }}" = "success" ]; then echo "moonweb.org deployed successfully!" >> $GITHUB_STEP_SUMMARY else - echo "Deployment failed. Check the deploy jobs for details." >> $GITHUB_STEP_SUMMARY + echo "Deployment failed. Check the deploy job for details." >> $GITHUB_STEP_SUMMARY fi echo "" >> $GITHUB_STEP_SUMMARY echo "### Sites" >> $GITHUB_STEP_SUMMARY diff --git a/AGENTS.md b/AGENTS.md index ce2888a..dc188bc 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -89,7 +89,7 @@ moonweb-site/ ```bash npm install cd timecapsule && npm install # Timecapsule Dependencies -npm run prebuild # Pre-Build Tasks (CV PDF generieren) +npm run prebuild:cv # Pre-Build Tasks (CV PDF generieren) npm run dev # Moonweb Sites (localhost:8081) npm run dev:stefankoelle # stefankoelle.de (localhost:8086) npm run dev:timecapsule # Timecapsule (localhost:8087) @@ -141,7 +141,7 @@ Das CV-PDF wird via WeasyPrint generiert: ```bash npm run pdf:cv # Einzelnes PDF generieren -npm run prebuild # Alle Pre-Build Tasks (inkl. CV PDF) +npm run prebuild:cv # Alle Pre-Build Tasks (inkl. CV PDF) ``` Dateien: diff --git a/README.md b/README.md index 8255441..a1c2e90 100755 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ npm run dev:timecapsule # timecapsule (localhost:8087) ### Build ```bash -npm run prebuild # pre-build tasks (CV PDF) +npm run prebuild:cv # pre-build tasks (CV PDF) npm run build # builds all moonweb sites (hub, infra, smarthome, code, retro) npm run build:stefankoelle # builds stefankoelle.de npm run build:timecapsule # builds timecapsule diff --git a/eleventy.config.js b/eleventy.config.js index 3d36cd4..068a476 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -87,7 +87,7 @@ module.exports = function (eleventyConfig) { dir: { input: ".", includes: "shared/_includes", - output: "dist", + output: "dist/moonweb", }, serverOptions: { host: "0.0.0.0", diff --git a/package.json b/package.json index 88ad30d..36cad0c 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,10 @@ "dev:timecapsule": "cd timecapsule && npx @11ty/eleventy --serve --port=8087", "build": "npx @11ty/eleventy", "build:stefankoelle": "npx @11ty/eleventy --config=stefankoelle/eleventy.config.js", - "build:timecapsule": "cd timecapsule && npx @11ty/eleventy && mkdir -p ../dist/timecapsule && cp -r _site/timecapsule/* ../dist/timecapsule/", + "build:timecapsule": "cd timecapsule && npx @11ty/eleventy && mkdir -p ../dist/moonweb/timecapsule && cp -r _site/timecapsule/* ../dist/moonweb/timecapsule/", "build:moonweb": "npm run build && npm run build:timecapsule", "pdf:cv": "bash stefankoelle/pdf/build-pdf.sh", - "prebuild": "bash prebuild.sh" + "prebuild:cv": "bash prebuild.sh" }, "devDependencies": { "@11ty/eleventy": "^3.1.6" diff --git a/stefankoelle/pdf/cv.pdf b/stefankoelle/pdf/cv.pdf index 31ecea5..06419cb 100644 Binary files a/stefankoelle/pdf/cv.pdf and b/stefankoelle/pdf/cv.pdf differ