Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade angular #629

Merged
merged 7 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
not ios_saf 15.2-15.3
not safari 15.2-15.3
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
node-version: [16.x]
steps:
- uses: actions/checkout@v3
- name: NPM install
run: npm i --force
run: npm i
- name: Build using Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ testem.log
Thumbs.db

package-lock.json
# Angular cache
.angular

#Env
src/environments/environment.dev.ts
Expand Down
71 changes: 71 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
image: node:lts-alpine
cache:
paths:
- node_modules/
stages:
- test
# - selenium
test_build:
cache: {}
stage: test
rules:
- if: '$CI_COMMIT_MESSAGE == "Update .gitlab-ci.yml file" && $CI_PIPELINE_SOURCE != "web"'
when: never
- if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"'
when: always
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
when: always
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"'
when: never
script:
- npm --version
- npm install --legacy-peer-deps
- npm install -g @angular/cli
- npm run build:all-prod
- cat ./dist/homer-ui/version.txt
# selenium-test-job:
# stage: selenium
# services:
# - name: selenium/standalone-chrome
# alias: selstand
# variables:
# GITLAB_INSTANCE: "gitlab.com"
# rules:
# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"'
# when: never
# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
# when: on_success
# - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
# when: always
# allow_failure: true
# script:
# - apk update && apk upgrade && apk add --no-cache bash git openssh
# - 'git clone http://gitlab-ci-token:$CI_JOB_TOKEN@$GITLAB_INSTANCE/qxip/hepic-tests.git'
# - npm install -g selenium-side-runner
# - npm install -g chromedriver
# - selenium-side-runner ./hepic-tests/Hepic-preference.side --server http://selstand:4444/wd/hub --filter Fulltest --base-url http://de9.sipcapture.io:8002/ "goog:chromeOptions.args=[no-sandbox]"
# # - selenium-side-runner ./hepic-tests/Hepic-preference-user.side --server http://selstand:4444/wd/hub --filter Default --base-url http://de9.sipcapture.io:8002/

# selenium-transaction-test-job:
# stage: selenium
# services:
# - name: selenium/standalone-chrome
# alias: selstand
# variables:
# GITLAB_INSTANCE: "gitlab.com"
# rules:
# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"'
# when: never
# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
# when: on_success
# - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
# when: always
# allow_failure: true
# script:
# - apk update && apk upgrade && apk add --no-cache bash git openssh
# - 'git clone http://gitlab-ci-token:$CI_JOB_TOKEN@$GITLAB_INSTANCE/qxip/hepic-tests.git'
# - npm install -g hepgen.js
# - npm install -g selenium-side-runner
# - npm install -g chromedriver
# - hepgen.js -p 9063 -s de3.null.qxip.net -c "/builds/qxip/hepic-interface/hepic-tests/Hepgen/RTP-test.js"
# - selenium-side-runner ./hepic-tests/Hepic-main.side --server http://selstand:4444/wd/hub --filter Default --base-url http://de9.sipcapture.io:8002/
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM node:12-alpine

RUN apk add git && git clone https://github.com/sipcapture/homer-ui /app
WORKDIR /app
RUN npm install && npm install -g @angular/cli
CMD ["ng","build"]

Loading
Loading