From 7ff10aba79b785d0703ce7f4ff45e3eb9eadae97 Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Sun, 21 Jan 2024 09:30:22 +0100 Subject: [PATCH] npm install: get rid of cp command --- .github/workflows/smoke.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- hugo.yaml | 8 ++++++++ package.json | 7 ------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/smoke.yaml b/.github/workflows/smoke.yaml index c267bfda93..99659bb79c 100644 --- a/.github/workflows/smoke.yaml +++ b/.github/workflows/smoke.yaml @@ -7,8 +7,8 @@ on: push: branches: [main] pull_request: - schedule: # midnight every day - - cron: '0 0 * * *' + # schedule: # midnight every day + # - cron: '0 0 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 74261610a1..589f1a51f9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,8 +7,8 @@ on: push: branches: [main] pull_request: - schedule: - - cron: '11 0 * * *' # 11 past midnight every day + # schedule: + # - cron: '11 0 * * *' # 11 past midnight every day workflow_dispatch: jobs: diff --git a/hugo.yaml b/hugo.yaml index 3930bcf3ef..9165173f28 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -24,6 +24,10 @@ module: target: assets - source: node_modules/bootstrap target: assets/vendor/bootstrap + - source: node_modules/bootstrap/scss + target: assets/vendor/bootstrap/scss + - source: node_modules/bootstrap/scss/vendor + target: assets/vendor/bootstrap/scss/vendor - source: node_modules/@fortawesome/fontawesome-free target: assets/vendor/Font-Awesome - source: i18n @@ -38,6 +42,10 @@ module: # "../.." moves out of themes/docsy so that Docsy can find its dependencies. - source: ../../node_modules/bootstrap target: assets/vendor/bootstrap + - source: ../../node_modules/bootstrap/scss + target: assets/vendor/bootstrap/scss + - source: ../../node_modules/bootstrap/scss/vendor + target: assets/vendor/bootstrap/scss/vendor - source: ../../node_modules/@fortawesome/fontawesome-free target: assets/vendor/Font-Awesome - source: ../../node_modules/@fortawesome/fontawesome-free/webfonts diff --git a/package.json b/package.json index f7750fd7e0..ee284fc1d2 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,7 @@ "scripts": { "_cd:docs": "cd userguide &&", "_check:format": "npx prettier --check .??* *.md", - "_cp:bs-rfs": "cp -R node_modules/bootstrap/scss/vendor/* assets/_vendor/bootstrap/scss/", "_mkdir:hugo-mod": "npx mkdirp ../github.com/FortAwesome/Font-Awesome ../github.com/twbs/bootstrap", - "_prebuild": "npm run _cp:bs-rfs", "build:preview": "npm run cd:docs build:preview", "build:production": "npm run cd:docs build:production", "build": "npm run cd:docs build", @@ -24,11 +22,6 @@ "get:hugo-modules": "node tools/getHugoModules/index.mjs", "get:submodule": "set -x && git submodule update --init ${DEPTH:- --depth 1}", "postinstall": "npm run _mkdir:hugo-mod", - "prebuild:preview": "npm run _prebuild", - "prebuild:production": "npm run _prebuild", - "prepare": "npm run _cp:bs-rfs", - "preserve": "npm run _prebuild", - "pretest": "npm run _prebuild", "serve": "npm run cd:docs serve", "test": "npm run cd:docs test && npm run check", "update:pkg:dep": "npm install --save-exact @fortawesome/fontawesome-free@latest bootstrap@latest",