mirror of
https://github.com/skoelle/moonweb-site.git
synced 2026-09-17 17:00:25 +00:00
Separate build outputs: moonweb -> dist/moonweb/, stefankoelle -> dist/stefankoelle/
- eleventy.config.js: output to dist/moonweb/ (was dist/) - build-deploy-moonweb.yml: deploy from dist/moonweb/ - package.json: timecapsule copies to dist/moonweb/timecapsule/ - Rename prebuild -> prebuild:cv to prevent npm lifecycle hook from running before build (build-pdf.sh was contaminating dist/ with stefankoelle output)
This commit is contained in:
@@ -43,15 +43,15 @@ jobs:
|
|||||||
- name: Validate build output
|
- name: Validate build output
|
||||||
run: |
|
run: |
|
||||||
echo "Build output:"
|
echo "Build output:"
|
||||||
find dist -maxdepth 2 -type f | sort | head -40
|
find dist/moonweb -maxdepth 2 -type f | sort | head -40
|
||||||
echo "..."
|
echo "..."
|
||||||
echo "Total files:"
|
echo "Total files:"
|
||||||
find dist -type f | wc -l
|
find dist/moonweb -type f | wc -l
|
||||||
|
|
||||||
# Verify key directories exist
|
# Verify key directories exist
|
||||||
for dir in "" infra smarthome code retro timecapsule; do
|
for dir in "" infra smarthome code retro timecapsule; do
|
||||||
if [ -n "$dir" ] && [ ! -d "dist/$dir" ]; then
|
if [ -n "$dir" ] && [ ! -d "dist/moonweb/$dir" ]; then
|
||||||
echo "Error: dist/$dir not found"
|
echo "Error: dist/moonweb/$dir not found"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -60,7 +60,7 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: dist-moonweb
|
name: dist-moonweb
|
||||||
path: dist/
|
path: dist/moonweb
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
@@ -73,12 +73,12 @@ jobs:
|
|||||||
uses: actions/download-artifact@v8
|
uses: actions/download-artifact@v8
|
||||||
with:
|
with:
|
||||||
name: dist-moonweb
|
name: dist-moonweb
|
||||||
path: dist/
|
path: dist/moonweb
|
||||||
|
|
||||||
- name: Deploy via SFTP
|
- name: Deploy via SFTP
|
||||||
uses: wlixcc/SFTP-Deploy-Action@v1.2.6
|
uses: wlixcc/SFTP-Deploy-Action@v1.2.6
|
||||||
with:
|
with:
|
||||||
local_path: './dist/*'
|
local_path: './dist/moonweb/*'
|
||||||
server: ${{ secrets.IONOS_SFTP_HOST }}
|
server: ${{ secrets.IONOS_SFTP_HOST }}
|
||||||
username: ${{ secrets.IONOS_SFTP_USER }}
|
username: ${{ secrets.IONOS_SFTP_USER }}
|
||||||
password: ${{ secrets.IONOS_SFTP_PASSWORD }}
|
password: ${{ secrets.IONOS_SFTP_PASSWORD }}
|
||||||
@@ -99,7 +99,7 @@ jobs:
|
|||||||
if [ "${{ needs.deploy.result }}" = "success" ]; then
|
if [ "${{ needs.deploy.result }}" = "success" ]; then
|
||||||
echo "moonweb.org deployed successfully!" >> $GITHUB_STEP_SUMMARY
|
echo "moonweb.org deployed successfully!" >> $GITHUB_STEP_SUMMARY
|
||||||
else
|
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
|
fi
|
||||||
echo "" >> $GITHUB_STEP_SUMMARY
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "### Sites" >> $GITHUB_STEP_SUMMARY
|
echo "### Sites" >> $GITHUB_STEP_SUMMARY
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ moonweb-site/
|
|||||||
```bash
|
```bash
|
||||||
npm install
|
npm install
|
||||||
cd timecapsule && npm install # Timecapsule Dependencies
|
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 # Moonweb Sites (localhost:8081)
|
||||||
npm run dev:stefankoelle # stefankoelle.de (localhost:8086)
|
npm run dev:stefankoelle # stefankoelle.de (localhost:8086)
|
||||||
npm run dev:timecapsule # Timecapsule (localhost:8087)
|
npm run dev:timecapsule # Timecapsule (localhost:8087)
|
||||||
@@ -141,7 +141,7 @@ Das CV-PDF wird via WeasyPrint generiert:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm run pdf:cv # Einzelnes PDF generieren
|
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:
|
Dateien:
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ npm run dev:timecapsule # timecapsule (localhost:8087)
|
|||||||
### Build
|
### Build
|
||||||
|
|
||||||
```bash
|
```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 # builds all moonweb sites (hub, infra, smarthome, code, retro)
|
||||||
npm run build:stefankoelle # builds stefankoelle.de
|
npm run build:stefankoelle # builds stefankoelle.de
|
||||||
npm run build:timecapsule # builds timecapsule
|
npm run build:timecapsule # builds timecapsule
|
||||||
|
|||||||
+1
-1
@@ -87,7 +87,7 @@ module.exports = function (eleventyConfig) {
|
|||||||
dir: {
|
dir: {
|
||||||
input: ".",
|
input: ".",
|
||||||
includes: "shared/_includes",
|
includes: "shared/_includes",
|
||||||
output: "dist",
|
output: "dist/moonweb",
|
||||||
},
|
},
|
||||||
serverOptions: {
|
serverOptions: {
|
||||||
host: "0.0.0.0",
|
host: "0.0.0.0",
|
||||||
|
|||||||
+2
-2
@@ -9,10 +9,10 @@
|
|||||||
"dev:timecapsule": "cd timecapsule && npx @11ty/eleventy --serve --port=8087",
|
"dev:timecapsule": "cd timecapsule && npx @11ty/eleventy --serve --port=8087",
|
||||||
"build": "npx @11ty/eleventy",
|
"build": "npx @11ty/eleventy",
|
||||||
"build:stefankoelle": "npx @11ty/eleventy --config=stefankoelle/eleventy.config.js",
|
"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",
|
"build:moonweb": "npm run build && npm run build:timecapsule",
|
||||||
"pdf:cv": "bash stefankoelle/pdf/build-pdf.sh",
|
"pdf:cv": "bash stefankoelle/pdf/build-pdf.sh",
|
||||||
"prebuild": "bash prebuild.sh"
|
"prebuild:cv": "bash prebuild.sh"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@11ty/eleventy": "^3.1.6"
|
"@11ty/eleventy": "^3.1.6"
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user