From 8da4133d007e7ddae8afe47d376a3f561ad8fac2 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 23:56:13 +0100 Subject: [PATCH] migrated to workflow and some updates --- .drone.yml | 44 ----------------------- .forgejo/workflows/build-deploy.yml | 54 +++++++++++++++++++++++++++++ .woodpecker.yml | 34 ------------------ gulpfile.js | 2 +- package.json | 17 ++++----- 5 files changed, 64 insertions(+), 87 deletions(-) delete mode 100644 .drone.yml create mode 100644 .forgejo/workflows/build-deploy.yml delete mode 100644 .woodpecker.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index ea5ab49..0000000 --- a/.drone.yml +++ /dev/null @@ -1,44 +0,0 @@ -kind: pipeline -type: docker -name: default - -steps: - - name: build - image: node:lts - commands: - - npm install - - npm run build - - name: deploy-dev - image: alpine - environment: - FTP_HOST: - from_secret: FTP_HOST - FTP_USERNAME: - from_secret: FTP_USERNAME - FTP_PASSWORD: - from_secret: FTP_PASSWORD - commands: - - which lftp || ( apk --update add lftp ) - - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ dev.sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST - when: - branch: - - develop - event: - - push - - name: deploy - image: alpine - environment: - FTP_HOST: - from_secret: FTP_HOST - FTP_USERNAME: - from_secret: FTP_USERNAME - FTP_PASSWORD: - from_secret: FTP_PASSWORD - commands: - - which lftp || ( apk --update add lftp ) - - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST - when: - branch: - - main - event: - - push diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml new file mode 100644 index 0000000..978e7e7 --- /dev/null +++ b/.forgejo/workflows/build-deploy.yml @@ -0,0 +1,54 @@ +name: Build and Deploy Website + +on: [push] + +jobs: + build: + name: Build Website + runs-on: docker + container: + image: node:lts + steps: + - uses: actions/checkout@v3 + - name: Install Dependencies + run: npm install + - name: Build Website + run: npm run build + - uses: actions/upload-artifact@v3 + with: + name: build + path: dist/ + deploy-dev: + name: Deploy Dev Website + runs-on: docker + container: + image: node:lts-alpine + needs: [build] + if: github.ref == 'refs/heads/develop' + steps: + - uses: actions/download-artifact@v3 + - name: Install Dependencies + run: which lftp || ( apk --update add lftp ) + - name: Deploy Website + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/ dev.sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + env: + FTP_HOST: ${{ secrets.FTP_HOST }} + FTP_USERNAME: ${{ secrets.FTP_USERNAME }} + FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} + deploy: + name: Deploy Website + runs-on: docker + container: + image: node:lts-alpine + needs: [build] + if: github.ref == 'refs/heads/main' + steps: + - uses: actions/download-artifact@v3 + - name: Install Dependencies + run: which lftp || ( apk --update add lftp ) + - name: Deploy Website + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/ sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + env: + FTP_HOST: ${{ secrets.FTP_HOST }} + FTP_USERNAME: ${{ secrets.FTP_USERNAME }} + FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 5ac1123..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,34 +0,0 @@ -pipeline: - build: - image: node:lts - commands: - - npm install - - npm run build - deploy-dev: - image: alpine - secrets: - - FTP_HOST - - FTP_USERNAME - - FTP_PASSWORD - commands: - - which lftp || ( apk --update add lftp ) - - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ dev.sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST - when: - branch: - - develop - event: - - push - deploy: - image: alpine - secrets: - - FTP_HOST - - FTP_USERNAME - - FTP_PASSWORD - commands: - - which lftp || ( apk --update add lftp ) - - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST - when: - branch: - - main - event: - - push diff --git a/gulpfile.js b/gulpfile.js index a74af0d..91399bf 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -71,7 +71,7 @@ var uglify = require('gulp-terser'); var optimizejs = require('gulp-optimize-js'); // Styles -var sass = require('gulp-sass'); +var sass = require('gulp-sass')(require('sass')); var postcss = require('gulp-postcss'); var prefix = require('autoprefixer'); var minify = require('cssnano'); diff --git a/package.json b/package.json index 57e5499..613c2e5 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,12 @@ "url": "https://git.sp-codes.de/samuel-p/sp-magic.de" }, "optionalDependencies": { - "browser-sync": "^2.27.6" + "browser-sync": "^2.29.3" }, "devDependencies": { - "autoprefixer": "10.3.7", - "cssnano": "5.0.8", - "del": "6.0.0", + "autoprefixer": "10.4.16", + "cssnano": "6.0.1", + "del": "6.1.1", "gulp": "4.0.2", "gulp-concat": "2.6.1", "gulp-flatmap": "1.0.2", @@ -25,15 +25,16 @@ "gulp-optimize-js": "1.1.0", "gulp-postcss": "9.0.1", "gulp-rename": "2.0.0", - "gulp-sass": "4.1.1", + "gulp-sass": "5.1.0", "gulp-terser": "2.1.0", "lazypipe": "1.0.2", "node-sass-tilde-importer": "^1.0.2", - "postcss": "^8.3.11" + "postcss": "^8.4.32", + "sass": "^1.69.5" }, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.4", - "bootstrap": "^4.6.0", - "jquery": "^3.6.0" + "bootstrap": "^4.6.2", + "jquery": "^3.7.1" } }