Merge pull request #16 from shopware/next-33446/tidy-up-ci

NEXT-33446 - tidy up ci
shopware · Feb 15, 2024 · ab858ce · ab858ce
2 parents 24d73cf + 7d3a73f
commit ab858ce
Show file tree

Hide file tree

Showing 19 changed files with 263 additions and 216 deletions.
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
diff --git a/.github/workflows/deploy-developer-portal.yml b/.github/workflows/deploy-developer-portal.yml
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'packages/component-library/**'
 
 jobs:
   create-storybook-pages:
@@ -20,12 +22,14 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --prefer-offline
 
-      - name: Create the static pages directory locally in CI
-        run: pnpm --prefix ./packages/component-library run build-storybook
+      - name: Build storybook
+        run: pnpx turbo run build:storybook --filter=@shopware-ag/meteor-component-library
 
       - name: Deploy 🚀
         uses: JamesIves/[email protected]

diff --git a/.github/workflows/developer-portal-healthckeck.yml b/.github/workflows/developer-portal-healthckeck.yml
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,6 +1,9 @@
 name: Docs
 
-on: push
+on:
+  push:
+    branches:
+      - main
 
 jobs:
   create-docs-icon-kit:
@@ -10,7 +13,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Deploy redirect
-        if: github.ref == 'refs/heads/main'
         uses: JamesIves/[email protected]
         with:
           branch: gh-pages
@@ -31,6 +33,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --prefer-offline
@@ -45,7 +49,6 @@ jobs:
           pnpm run doc
 
       - name: Deploy 🚀
-        if: github.ref == 'refs/heads/trunk'
         uses: JamesIves/[email protected]
         with:
           branch: gh-pages

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -1,18 +1,20 @@
 name: Deploy PR previews
 
-on:
+on: 
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - closed
+    branches:
+      - main
+    paths:
+      - 'packages/component-library/**'
 
 concurrency: preview-${{ github.ref }}
 
 jobs:
   deploy-preview:
     runs-on: ubuntu-latest
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
@@ -25,12 +27,14 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install main dependencies
         run: pnpm install --frozen-lockfile --prefer-offline
 
-      - name: Create the static pages directory locally in CI
-        run: pnpm --prefix ./packages/component-library run build-storybook
+      - name: Build storybook
+        run: pnpx turbo run build:storybook --filter=@shopware-ag/meteor-component-library
 
       - name: Deploy preview
         uses: rossjrw/pr-preview-action@v1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,6 +23,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm i

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,18 +28,20 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm i
 
       - name: Check formatting
-        run: pnpm run format:check
+        run: pnpx turbo run format:check
 
       - name: Perform typecheck
-        run: pnpm run lint:types
+        run: pnpx turbo run lint:types
 
       - name: Lint code
-        run: pnpm run lint:eslint
+        run: pnpx turbo run lint:eslint
 
   unit-tests:
     name: Unit tests
@@ -59,12 +61,14 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --prefer-offline
 
       - name: unit
-        run: pnpm run test:unit
+        run: pnpx turbo run test:unit
 
   circular-dependencies:
     name: Check for circular dependencies (Madge)
@@ -84,6 +88,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --prefer-offline
@@ -99,6 +105,9 @@ jobs:
       - circular-dependencies
       - unit-tests
       - static-analysis
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -111,6 +120,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --prefer-offline
@@ -119,7 +130,7 @@ jobs:
         run: npx playwright install
 
       - name: Run Playwright tests
-        run: pnpm --filter @shopware-ag/meteor-admin-sdk run test:e2e
+        run: pnpx turbo run test:e2e --filter @shopware-ag/meteor-admin-sdk
 
       - uses: actions/upload-artifact@v2
         if: always()

diff --git a/.github/workflows/update-healthcheck.yml b/.github/workflows/update-healthcheck.yml
diff --git a/.github/workflows/update-icons.yml b/.github/workflows/update-icons.yml
@@ -23,15 +23,17 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --prefer-offline
 
       - name: Build
-        run: pnpm --prefix ./packages/icon-kit run build
+        run: pnpm --filter @shopware-ag/meteor-component-library run build
 
       - name: Update icons
-        run: pnpm --prefix ./packages/icon-kit run start
+        run: pnpm --filter @shopware-ag/meteor-component-library run start
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4

diff --git a/.github/workflows/visual-tests.yml b/.github/workflows/visual-tests.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'packages/component-library/**'
 
   workflow_dispatch:
 
@@ -27,23 +29,23 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --prefer-offline
 
       - name: Install Playwright
         run: pnpm dlx playwright install
-
-      - name: Create the static pages directory locally in CI
-        run: pnpm --prefix ./packages/component-library run build-storybook
+      
+      - name: Build storybook
+        run: pnpx turbo run build:storybook --filter=@shopware-ag/meteor-component-library
 
       - name: Run Tests
-        id: storybookTests
         run: |
-          cd ./packages/component-library &&
           npx concurrently --kill-others --success first --names "SB,TEST" --prefix-colors "magenta,blue" \
-          "http-server storybook-static -a 127.0.0.1 --port 6006" \
-          "wait-on http://127.0.0.1:6006 && pnpm run test-storybook"
+          "pnpm --filter @shopware-ag/meteor-component-library run start:storybook" \
+          "wait-on http://127.0.0.1:6006 && pnpx turbo run test:storybook --filter=@shopware-ag/meteor-component-library"
 
       - name: Archive visual test diffs
         uses: actions/upload-artifact@v3

diff --git a/package.json b/package.json
@@ -3,16 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "description": "The monorepo that contains all Meteor related projects",
-  "scripts": {
-    "build": "turbo run build",
-    "lint:all": "turbo run lint:all",
-    "lint:types": "turbo run lint:types",
-    "lint:eslint": "turbo run lint:eslint",
-    "format": "turbo run format",
-    "format:check": "turbo run format:check",
-    "test:unit": "turbo run test:unit",
-    "test:e2e": "turbo run test:e2e"
-  },
+  "scripts": {},
   "keywords": [],
   "license": "MIT",
   "devDependencies": {

diff --git a/packages/admin-sdk/README.md b/packages/admin-sdk/README.md
@@ -1,4 +1,4 @@
-# meteor-admin-sdk
+  # meteor-admin-sdk
 [![Tests](https://github.com/shopware/meteor-admin-sdk/actions/workflows/tests.yml/badge.svg)](https://github.com/shopware/meteor-admin-sdk/actions/workflows/tests.yml)
 [![NPM Package](https://img.shields.io/npm/v/@shopware-ag/meteor-admin-sdk)](https://www.npmjs.com/package/@shopware-ag/meteor-admin-sdk)