Skip to content

Commit

Permalink
Merge pull request #35622 from nextcloud/feat/auto-build-icons-sass-o…
Browse files Browse the repository at this point in the history
…n-build

Automatically build sass and sass:icons after build
  • Loading branch information
skjnldsv committed Dec 7, 2022
2 parents 172aade + de3c5f2 commit 741f32e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/command-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@ jobs:
npm ci
npm run build --if-present
- name: Build css
run: npm run --if-present sass

- name: Build icons css
run: npm run --if-present sass:icons

- name: Commit and push default
if: ${{ needs.init.outputs.arg1 != 'fixup' && needs.init.outputs.arg1 != 'amend' }}
run: |
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ jobs:
npm ci
npm run build --if-present
- name: Build css
run: npm run sass

- name: Build icons css
run: npm run sass:icons

- name: Check webpack build changes
run: |
bash -c "[[ ! \"`git status --porcelain `\" ]] || (echo 'Please recompile and commit the assets, see the section \"Show changes on failure\" for details' && exit 1)"
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
},
"scripts": {
"build": "NODE_ENV=production webpack --progress --config webpack.prod.js",
"postbuild": "npm run sass && npm run sass:icons",
"dev": "NODE_ENV=development webpack --progress --config webpack.dev.js",
"watch": "NODE_ENV=development webpack --progress --watch --config webpack.dev.js",
"lint": "eslint 'apps/*/src/**/*.{vue,js}' 'core/src/**/*.{vue,js}'",
Expand Down

0 comments on commit 741f32e

Please sign in to comment.