diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index 0bc9881..adae29d 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -3,30 +3,11 @@ name: Build and Deploy Website on: [push] jobs: - build-dev: - name: Build Dev Website - runs-on: docker - container: - image: node:lts - if: github.ref != 'refs/heads/main' - steps: - - uses: actions/checkout@v4 - - name: Install Dependencies - run: npm install - - name: Build English Version - run: npm run build:dev - - name: Build German Version - run: npm run build:dev:de - - uses: actions/upload-artifact@v3 - with: - name: build - path: dist/ build: name: Build Website runs-on: docker container: image: node:lts - if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v4 - name: Install Dependencies @@ -44,7 +25,7 @@ jobs: runs-on: docker container: image: node:lts-alpine - needs: [build-dev] + needs: [build] if: github.ref == 'refs/heads/develop' steps: - uses: actions/download-artifact@v3 diff --git a/README.md b/README.md index 8ad18cd..f9288e5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://ci.sp-codes.de/api/badges/samuel-p/samuel-philipp.de/status.svg)](https://ci.sp-codes.de/samuel-p/samuel-philipp.de) + # samuel-philipp.de Website for [samuel-philipp.de](https://samuel-philipp.de) and [samuel-philipp.com](https://samuel-philipp.com) diff --git a/package.json b/package.json index 3fc19d9..c98e439 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,7 @@ "start": "eleventy --serve --watch", "start:de": "LANGUAGE=de eleventy --serve --watch", "build": "eleventy && npm run minify-css", - "build:de": "LANGUAGE=de eleventy && npm run minify-css", - "build:dev": "BUILD=dev eleventy && npm run minify-css", - "build:dev:de": "BUILD=dev LANGUAGE=de eleventy && npm run minify-css" + "build:de": "LANGUAGE=de eleventy && npm run minify-css" }, "author": "samuel-p", "repository": { @@ -27,6 +25,7 @@ "@node-minify/crass": "^8.0.6", "@node-minify/html-minifier": "^8.0.6", "@sardine/eleventy-plugin-tinyhtml": "^0.2.0", + "cpx": "^1.5.0", "eleventy-plugin-rev": "^2.0.0", "eleventy-sass": "^2.2.4", "glob": "^10.3.12", diff --git a/src/_data/global.dev.json b/src/_data/global.dev.json deleted file mode 100644 index beb27b8..0000000 --- a/src/_data/global.dev.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "languages": [ - { - "label": "Deutsch", - "code": "de", - "icon": "de", - "url": "https://dev.samuel-philipp.de" - }, - { - "label": "English", - "code": "en", - "icon": "us", - "url": "https://dev.samuel-philipp.com" - } - ] -} diff --git a/src/_data/global.json b/src/_data/global.json index 99af261..efbd6eb 100644 --- a/src/_data/global.json +++ b/src/_data/global.json @@ -4,17 +4,17 @@ "description": "Samuel Philipp - Full-Stack Developer / SysAdmin / Magician", "author": "Samuel Philipp", "languages": [ - { - "label": "Deutsch", - "code": "de", - "icon": "de", - "url": "https://samuel-philipp.de" - }, { "label": "English", "code": "en", "icon": "us", "url": "https://samuel-philipp.com" + }, + { + "label": "Deutsch", + "code": "de", + "icon": "de", + "url": "https://samuel-philipp.de" } ], "menu": { diff --git a/src/_data/site.js b/src/_data/site.js index 73458ad..b22ee0f 100644 --- a/src/_data/site.js +++ b/src/_data/site.js @@ -1,11 +1,6 @@ -const fs = require("fs"); const site = require("./global.json"); -site.buildName = process.env.BUILD || 'prod'; -if (fs.existsSync(`${__dirname}/global.${site.buildName}.json`)) { - Object.assign(site, require(`./global.${site.buildName}.json`)); -} -site.buildTime = new Date().toISOString(); +site.buildTime = new Date(); site.lang = process.env.LANGUAGE || 'en'; site.language = site.languages.find(l => l.code === site.lang); site.strings = require(`./i18n/${site.lang}.json`); diff --git a/src/index.html b/src/index.html index dacbbad..42a5ed3 100644 --- a/src/index.html +++ b/src/index.html @@ -79,10 +79,10 @@ title: {{site.title}} class="i-stackoverflow i-2x i-fw">