diff --git a/.gitignore b/.gitignore index 8be93ab..28fe2f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ - dist/ node_modules/ grav/ -fontawesome-pro.tar.gz -fontawesome-pro.tar.gz.enc +.npmrc diff --git a/.drone.yml b/.woodpecker.yml similarity index 73% rename from .drone.yml rename to .woodpecker.yml index 3eac1a6..381b3f4 100644 --- a/.drone.yml +++ b/.woodpecker.yml @@ -9,13 +9,13 @@ steps: image: node:16.0.0 pull: always environment: - PASS: - from_secret: fontawesome_password + FA_TOKEN: + from_secret: fontawesome_token commands: - - curl -O "http://public.serguzim.me.sos-de-fra-1.exo.io/fontawesome-pro.tar.gz.enc" - - openssl enc -aes256 -pbkdf2 -out "fontawesome-pro.tar.gz" -in "fontawesome-pro.tar.gz.enc" -d -k $PASS + - echo "@fortawesome:registry=https://npm.fontawesome.com/" > .npmrc + - echo "//npm.fontawesome.com/:_authToken=${FA_TOKEN}" >> .npmrc - npm install - - npx mix build --production + - npm run production - name: prepare zip image: bash diff --git a/package-lock.json b/package-lock.json index cb677ad..6a4d1b9 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 5a51539..b85bf29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reitanlage-oranienburg", - "version": "1.2.5", + "version": "1.2.6", "description": "The Reitanlage Oranienburg Theme for Grav CMS.", "main": "index.js", "scripts": { @@ -26,7 +26,7 @@ "sass-loader": "^12.1.0" }, "dependencies": { - "@fortawesome/fontawesome-pro": "file:fontawesome-pro.tar.gz", + "@fortawesome/fontawesome-pro": "^6.0.0", "bootstrap": "^4.6.0", "cross-env": "^7.0.3", "jquery": "^3.6.0",