Skip to content

Commit

Permalink
Chore/new-output-ng-17 (#1159)
Browse files Browse the repository at this point in the history
* chore: adjust ng apps

* chore: add v17

* chore: update ci with v17

* chore: update ci with v17

* chore: update ci with v17

* chore: update ci with v17

* chore: update ci with v17

* chore: update ci with v17

* chore: update ci with v17

* chore: update ci with v17

* chore: update ci with v17

* chore: copy proxies

* chore: add missing links

* chore: link testing lib

* chore: link testing lib

* chore: link testing lib

* chore: link testing lib

* chore: link testing lib

* chore: link testing lib

* chore: link testing lib

* chore: hide icons

* chore: combine links

* chore: combine links

* chore: add matrix

* chore: add fonts

* chore: add v17

* chore: add v17

* chore: add v17

* chore: update to v17

* chore: use css
  • Loading branch information
hirsch88 authored Nov 23, 2023
1 parent 358797b commit 45fb7d3
Show file tree
Hide file tree
Showing 79 changed files with 34,546 additions and 11,963 deletions.
42 changes: 39 additions & 3 deletions .github/workflows/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,45 @@ runs:

- uses: ./.github/workflows/actions/upload-archive
with:
name: test-ng-v16-e2e
output: apps/angular/v16/TestNgv16E2eBuild.zip
paths: apps/angular/v16/dist
name: tokens-dist
output: packages/tokens/TokensDist.zip
paths: packages/tokens/dist

- uses: ./.github/workflows/actions/upload-archive
with:
name: css-dist
output: packages/css/CssDist.zip
paths: packages/css/css

# - uses: ./.github/workflows/actions/upload-archive
# with:
# name: icons-dist
# output: packages/icons/IconsDist.zip
# paths: packages/icons/dist

- uses: ./.github/workflows/actions/upload-archive
with:
name: components-dist
output: packages/components/ComponentsDist.zip
paths: packages/components/dist

- uses: ./.github/workflows/actions/upload-archive
with:
name: components-loader
output: packages/components/ComponentsLoader.zip
paths: packages/components/loader

- uses: ./.github/workflows/actions/upload-archive
with:
name: components-angular
output: packages/components/src/ComponentsAngular.zip
paths: packages/components-angular/src/generated

- uses: ./.github/workflows/actions/upload-archive
with:
name: testing-dist
output: packages/testing/TestingDist.zip
paths: packages/testing/dist

- uses: ./.github/workflows/actions/upload-archive
with:
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/actions/test-angular-setup-v16/action.yml

This file was deleted.

67 changes: 67 additions & 0 deletions .github/workflows/actions/test-angular-setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: 'Angular Setup'
description: 'Angular Setup'
inputs:
app:
description: 'The specific test application'
runs:
using: 'composite'
steps:
- name: Disable Husky
run: npm pkg delete scripts.prepare
shell: bash

- uses: ./.github/workflows/actions/download-archive
with:
name: components-dist
path: ./packages/components
filename: ComponentsDist.zip

- uses: ./.github/workflows/actions/download-archive
with:
name: tokens-dist
path: packages/tokens
filename: TokensDist.zip

- uses: ./.github/workflows/actions/download-archive
with:
name: css-dist
path: packages/css
filename: CssDist.zip

- uses: ./.github/workflows/actions/download-archive
with:
name: components-loader
path: ./packages/components
filename: ComponentsLoader.zip

- uses: ./.github/workflows/actions/download-archive
with:
name: components-angular
path: ./packages/components-angular/src
filename: ComponentsAngular.zip

- uses: ./.github/workflows/actions/download-archive
with:
name: testing-dist
path: ./packages/testing
filename: TestingDist.zip

- name: Install Dependencies
run: npm ci
working-directory: ./apps/angular/${{ inputs.app }}
shell: bash

- name: Post Install
run: npm run postinstall
working-directory: ./apps/angular/${{ inputs.app }}
shell: bash

- name: Install Cypress
run: npm run cy:install
working-directory: ./apps/angular/${{ inputs.app }}
shell: bash

- name: Build Angular App
run: npm run build
working-directory: ./apps/angular/${{ inputs.app }}
shell: bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: 'Test Angular v16'
description: 'Test Angular v16'
name: 'Test Angular'
description: 'Test Angular'
inputs:
app:
description: 'The specific test application'
runs:
using: 'composite'
steps:
Expand All @@ -8,14 +11,14 @@ runs:
with:
start: npm run cy:start
wait-on: 'http://localhost:4200'
working-directory: apps/angular/v16
working-directory: apps/angular/${{ inputs.app }}
install: false
browser: chrome

- name: Upload snapshots
uses: actions/upload-artifact@v3
if: failure()
with:
name: cypress-snapshots-angular-v16
path: apps/angular/v16/cypress/snapshots
name: cypress-snapshots-angular-${{ inputs.app }}
path: apps/angular/${{ inputs.app }}/cypress/snapshots

14 changes: 11 additions & 3 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,22 +117,30 @@ jobs:
- uses: ./.github/workflows/actions/test-components

test-angular:
name: 🧪 Angular Tests v16
name: 🧪 Angular Tests
runs-on: ubuntu-22.04
timeout-minutes: 30
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
TURBO_REMOTE_ONLY: true
HUSKY: 0
strategy:
fail-fast: false
matrix:
apps: [v16,v17]
needs: [build]
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: ./.github/workflows/actions/setup
- uses: ./.github/workflows/actions/test-angular-setup-v16
- uses: ./.github/workflows/actions/test-angular-v16
- uses: ./.github/workflows/actions/test-angular-setup
with:
app: ${{ matrix.apps }}
- uses: ./.github/workflows/actions/test-angular
with:
app: ${{ matrix.apps }}

test-e2e:
name: 🧪 E2E Tests
Expand Down
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,18 @@ docs/public/assets/images/map-markers
docs/public/assets/images/brand-icons
docs/public/assets/images/icons
docs/stories/assets/data

apps/angular/v16/*
!apps/angular/v16/scripts
!apps/angular/v16/package.json
!apps/angular/v16/package-lock.json
!apps/angular/v16/tsconfig.json
!apps/angular/v16/build.sh

apps/angular/v17/*
!apps/angular/v17/scripts
!apps/angular/v17/package.json
!apps/angular/v17/package-lock.json
!apps/angular/v17/tsconfig.json
!apps/angular/v17/build.sh

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="cypress" />

import '@baloise/design-system-testing/src/add-custom-commands'
import '@baloise/design-system-testing/dist/add-custom-commands'

// declare global {
// namespace Cypress {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
// SASS mixins and variables
@import '@baloise/design-system-css/sass/mixins';

// Resets CSS for all browser
@import '@baloise/design-system-css/css/normalize';
@import '@baloise/design-system-css/css/structure';

// Custom font faces
@import '@baloise/design-system-css/sass/font';
@import '@baloise/design-system-css/css/font';

// Core CSS, always required
@import '@baloise/design-system-css/css/core';
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
42 changes: 0 additions & 42 deletions apps/angular/v16/.gitignore

This file was deleted.

Loading

0 comments on commit 45fb7d3

Please sign in to comment.