diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1e4ffe57..95f6ecb87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,8 @@ jobs: cache: npm - name: Install Dependencies run: npm ci + - name: Build icons + run: npm run build:icons - name: Lint run: npm run lint - name: Run Tests @@ -44,6 +46,8 @@ jobs: cache: npm - name: Install Dependencies run: npm install --no-shrinkwrap + - name: Build icons + run: npm run build:icons - name: Run Tests run: npm run test:ember @@ -73,5 +77,7 @@ jobs: cache: npm - name: Install Dependencies run: npm ci + - name: Build icons + run: npm run build:icons - name: Run Tests run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} diff --git a/package.json b/package.json index 72f415cba..05319076a 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "test": "tests" }, "scripts": { - "build": "run-s icons build-ember build-storybook", - "build:icons": "node lib/generate-icon-components.mjs", + "build": "run-s build-ember build-storybook", + "build:icons": "concurrently \"node lib/generate-icon-components.mjs\" \"svg-symbols ./public/icons > ./public/appuniversum-symbolset.svg\"", "build:types": "glint -d", "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", "lint:css": "stylelint --allow-empty-input \"**/*.css\"", @@ -46,20 +46,18 @@ "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "lint:types": "glint", - "prepack": "glint -d", + "prepack": "run-s build:icons build:types", "postpack": "rimraf declarations", "start": "run-p ember storybook", - "ember": "ember serve", + "ember": "npm run build:icons && ember serve", "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"", "test:ember": "ember test", "test:ember-compatibility": "ember try:each", - "icons": "svg-symbols ./public/icons > ./public/appuniversum-symbolset.svg", - "prepare": "concurrently npm:build:icons npm:icons", "storybook": "start-storybook -p 6006", "build-storybook": "build-storybook", - "build-ember": "ember build --environment=production", + "build-ember": "npm run build:icons && ember build --environment=production", "build-ember-chromatic": "ember build --environment=chromatic", - "prep-chromatic": "run-s icons build-ember-chromatic", + "prep-chromatic": "run-s build:icons build-ember-chromatic", "release": "release-it", "chromatic": "chromatic --exit-zero-on-changes" },