Skip to content

Commit

Permalink
Merge branch 'master' into ion-img-draggable-prop
Browse files Browse the repository at this point in the history
* master: (284 commits)
  fix(label): only show placeholder with floating label when focused (ionic-team#22958)
  feat(react): add react hooks to control overlay components (ionic-team#22484)
  feat(vue): add composition API ionic lifecycle hooks (ionic-team#22970)
  chore(): run build
  5.5.5
  fix(vue): account for event name changes in vue 3.0.6+
  fix(react, vue): navigating using ion-back-button now selects correct page (ionic-team#22974)
  fix(progress-bar): use correct theme colors in dark mode (ionic-team#22965)
  fix(progress-bar): add width transition (ionic-team#22964)
  fix(vue): prevent race conditions when opening overlays (ionic-team#22883)
  fix(progress-bar): use correct theme colors in dark mode (ionic-team#22957)
  feat(searchbar): add showClearIcon property (ionic-team#22759)
  test(): update theming test with latest dark mode values (ionic-team#22956)
  chore(): update package-lock to account for npm 7.5.3 bug fix (ionic-team#22963)
  fix(header): collapsed toolbar is no longer incorrectly shown when using ion-refresher (ionic-team#22937)
  fix(react): onIonTabsWillChange and onIonTabsDidChange event handlers are now properly bound to IonTabs (ionic-team#22233)
  fix(refresher): add correct dark mode styles (ionic-team#22639)
  feat(custom-elements): add experimental custom elements build  (ionic-team#22863)
  fix(a11y): improve support for ids with special characters when getting label element (ionic-team#22680)
  chore(): update code of conduct (ionic-team#22619)
  ...
  • Loading branch information
cerkiner committed Mar 2, 2021
2 parents 0d7230d + 9282aa6 commit d3ff566
Show file tree
Hide file tree
Showing 1,071 changed files with 145,009 additions and 14,006 deletions.
148 changes: 134 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2
version: 2.1

aliases:
- &restore-cache
Expand Down Expand Up @@ -31,16 +31,35 @@ aliases:

defaults: &defaults
docker:
- image: circleci/node:10-browsers
- image: circleci/node:latest-browsers
working_directory: /tmp/workspace
environment:
NODE_ENV: development

jobs:
puppeteer-dependencies:
<<: *defaults
steps:
- run:
name: Install headless Chrome dependencies
command: |
sudo apt-get install -yq \
gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \
libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates \
fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
- run:
name: Install Puppeteer with Chromium
command: |
npm i puppeteer
build:
<<: *defaults
steps:
- checkout
- restore_cache: *restore-cache
- run: npm install
- run: npm install --legacy-peer-deps
- save_cache: *save-cache
- persist_to_workspace:
root: /tmp/workspace
Expand All @@ -56,7 +75,7 @@ jobs:
- restore_cache: *restore-cache-core
- restore_cache: *restore-cache-core-stencil
- run:
command: npm install
command: npm install --legacy-peer-deps
working_directory: /tmp/workspace/core
- save_cache: *save-cache-core
- run:
Expand All @@ -75,7 +94,7 @@ jobs:
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install
command: npm install --legacy-peer-deps
working_directory: /tmp/workspace/angular
- run:
command: sudo npm link
Expand All @@ -98,7 +117,7 @@ jobs:
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install
command: npm install --legacy-peer-deps
working_directory: /tmp/workspace/packages/angular-server
- run:
command: npm run build.prod
Expand All @@ -115,7 +134,7 @@ jobs:
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install
command: npm install --legacy-peer-deps
working_directory: /tmp/workspace/packages/react
- run:
command: sudo npm link
Expand All @@ -130,15 +149,14 @@ jobs:
root: /tmp/workspace
paths:
- "*"

build-react-router:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install
command: npm install --legacy-peer-deps
working_directory: /tmp/workspace/packages/react-router
- run:
command: sudo npm link
Expand All @@ -160,6 +178,52 @@ jobs:
paths:
- "*"

build-vue:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install
working_directory: /tmp/workspace/packages/vue
- run:
command: sudo npm link
working_directory: /tmp/workspace/core
- run:
command: sudo npm link @ionic/core
working_directory: /tmp/workspace/packages/vue
- run:
command: npm run build
working_directory: /tmp/workspace/packages/vue
- persist_to_workspace:
root: /tmp/workspace
paths:
- "*"

build-vue-router:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install
working_directory: /tmp/workspace/packages/vue-router
- run:
command: sudo npm link
working_directory: /tmp/workspace/packages/vue
- run:
command: sudo npm link @ionic/vue
working_directory: /tmp/workspace/packages/vue-router
- run:
command: npm run build
working_directory: /tmp/workspace/packages/vue-router
- persist_to_workspace:
root: /tmp/workspace
paths:
- "*"

test-core-clean-build:
<<: *defaults
steps:
Expand Down Expand Up @@ -263,6 +327,26 @@ jobs:
command: npm run lint
working_directory: /tmp/workspace/packages/react-router

test-vue-lint:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: /tmp/workspace
- run:
command: npm run lint
working_directory: /tmp/workspace/packages/vue

test-vue-router-lint:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: /tmp/workspace
- run:
command: npm run lint
working_directory: /tmp/workspace/packages/vue-router

test-react-spec:
<<: *defaults
steps:
Expand Down Expand Up @@ -301,23 +385,46 @@ jobs:
command: npm run test.spec
working_directory: /tmp/workspace/packages/react-router

test-vue-router-spec:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: /tmp/workspace
- run:
command: sudo npm link
working_directory: /tmp/workspace/core
- run:
command: sudo npm link @ionic/core
working_directory: /tmp/workspace/packages/vue
- run:
command: sudo npm link
working_directory: /tmp/workspace/packages/vue
- run:
command: sudo npm link @ionic/vue
working_directory: /tmp/workspace/packages/vue-router
- run:
command: npm run test.spec
working_directory: /tmp/workspace/packages/vue-router

test-angular-e2e:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install
command: npm install --legacy-peer-deps
working_directory: /tmp/workspace/angular/test/test-app
- run:
command: npm test
command: npm run test -- --protractor-config=e2e/protractor-ci.conf.js
working_directory: /tmp/workspace/angular/test/test-app

workflows:
version: 2
build:
jobs:
- puppeteer-dependencies
- build
- build-core:
requires: [build]
Expand All @@ -326,11 +433,14 @@ workflows:
- test-core-lint:
requires: [build-core]
- test-core-e2e:
requires: [build-core]
requires: [puppeteer-dependencies, build-core]
- test-core-spec:
requires: [build-core]
- test-core-treeshake:
requires: [build-core]
# Adam requested we skip this test for now
# since it is failing on ES5 code which
# will be removed in Ionic Framework v6
#- test-core-treeshake:
# requires: [build-core]
- test-core-screenshot:
requires: [build-core]
filters:
Expand Down Expand Up @@ -358,6 +468,16 @@ workflows:
requires: [build-react]
- test-react-router-spec:
requires: [build-react-router]
- build-vue:
requires: [build-core]
- build-vue-router:
requires: [build-core, build-vue]
- test-vue-lint:
requires: [build-vue]
- test-vue-router-lint:
requires: [build-vue-router]
- test-vue-router-spec:
requires: [build-vue-router]
- test-angular-lint:
requires: [build-angular]
- test-angular-e2e:
Expand Down
Loading

0 comments on commit d3ff566

Please sign in to comment.