Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/feature-pratham' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
shreyas1434shinde committed Feb 11, 2025
2 parents d9932eb + 1892cf9 commit 71bcd91
Show file tree
Hide file tree
Showing 122 changed files with 110,071 additions and 63,883 deletions.
43 changes: 17 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,37 @@
version: 2.1
orbs:
browser-tools: circleci/[email protected]
jobs:
build:
machine:
image: ubuntu-2004:202010-01
docker:
- image: cimg/node:18.19.1-browsers
steps:
- checkout
- browser-tools/install-chrome
- run:
name: Install Node.js v14 with build in nvm tool
command: |
export NVM_DIR="/opt/circleci/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
nvm install v14 && nvm use 14 && nvm alias default 14
node -v
command: google-chrome --version
- checkout
- run:
name: Check Node version
command: node -v
- restore_cache:
keys:
- node_modules_cache_{{ checksum "package-lock.json" }}
- run:
name: Install QuML Library dependencies
command: cd projects/quml-library && npm install --no-progress
# - run:
# name: Installing angular cli
# command: 'npm install -g @angular/cli@16 --no-progress'
# - restore_cache:
# keys:
# - node_modules_cache_{{ checksum "package-lock.json" }}
# - run:
# name: Install QuML Library dependencies
# command: cd projects/quml-library && npm install --no-progress
- run:
name: Install project dependencies
command: |
if [ ! -d "node_modules" ]; then
npm i -f
fi
command: npm install --no-progress
- save_cache:
key: node_modules_cache_{{ checksum "package-lock.json" }}
paths:
- node_modules
- run:
name: Executing test cases
command: npm run test-lib-ci
- run:
name: Install Node.js v16 with build in nvm tool
command: |
export NVM_DIR="/opt/circleci/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
nvm install v16 && nvm use 16 && nvm alias default 16
node -v
- run:
name: Install sonar scanner
command: npm install -g sonarqube-scanner
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: CI Build and Test Pipeline

on:
push:
branches:
- '**'
pull_request:
branches:
- '**'

jobs:
build-and-test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18]

steps:
- name: Checkout Code Repository
uses: actions/checkout@v4

- name: Set Up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: package-lock.json

- name: Install Project Dependencies
run: npm ci

- name: Execute Tests
run: npm run test-lib-ci

- name: Build Library
run: npm run build-lib
16 changes: 0 additions & 16 deletions .github/workflows/jira-description-action.yml

This file was deleted.

4 changes: 2 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
],
"styles": [
"projects/quml-demo-app/src/styles.css",
"./node_modules/@project-sunbird/sb-styles/assets/_styles.scss",
"./node_modules/@project-sunbird/sb-styles/assets/styles.scss",
"projects/quml-library/src/lib/assets/styles/quml-carousel.css",
"./node_modules/katex/dist/katex.min.css"
],
Expand Down Expand Up @@ -183,7 +183,7 @@
],
"styles": [
"./projects/quml-player-wc/src/styles.scss",
"./node_modules/@project-sunbird/sb-styles/assets/_styles.scss",
"./node_modules/@project-sunbird/sb-styles/assets/styles.scss",
"projects/quml-library/src/lib/assets/styles/quml-carousel.css",
"./node_modules/katex/dist/katex.min.css"
],
Expand Down
Loading

0 comments on commit 71bcd91

Please sign in to comment.