Browse Source

* Few travis fixes

* Preparing upgrade to angular 10
pull/67/head
Per-Arne Andersen 4 years ago
parent
commit
2f548243fc
  1. 9
      .travis.yml
  2. 0
      scripts/ci.sh
  3. 12
      wg_dashboard_frontend/angular.json
  4. 11
      wg_dashboard_frontend/package.json

9
.travis.yml

@ -1,10 +1,15 @@
dist: xenial dist: focal
addons:
apt:
sources:
- sourceline: 'deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable'
packages:
- docker
sudo: required sudo: required
env: env:
global: global:
- DOCKER_REPO=perara/wg-manager - DOCKER_REPO=perara/wg-manager
before_install: before_install:
- curl -fsSL https://get.docker.com | sh
- echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json - echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json
- mkdir -p $HOME/.docker - mkdir -p $HOME/.docker
- echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json - echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json

0
scripts/ci.sh

12
wg_dashboard_frontend/angular.json

@ -3,7 +3,7 @@
"version": 1, "version": 1,
"newProjectRoot": "projects", "newProjectRoot": "projects",
"projects": { "projects": {
"material-angular-dashboard": { "wg-manager": {
"root": "", "root": "",
"sourceRoot": "src", "sourceRoot": "src",
"projectType": "application", "projectType": "application",
@ -56,19 +56,19 @@
"serve": { "serve": {
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
"options": { "options": {
"browserTarget": "material-angular-dashboard:build", "browserTarget": "wg-manager:build",
"proxyConfig": "proxy.conf.json" "proxyConfig": "proxy.conf.json"
}, },
"configurations": { "configurations": {
"production": { "production": {
"browserTarget": "material-angular-dashboard:build:production" "browserTarget": "wg-manager:build:production"
} }
} }
}, },
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",
"options": { "options": {
"browserTarget": "material-angular-dashboard:build" "browserTarget": "wg-manager:build"
} }
}, },
"lint": { "lint": {
@ -84,13 +84,13 @@
} }
} }
}, },
"material-angular-dashboard-e2e": { "wg-manager-e2e": {
"root": "", "root": "",
"sourceRoot": "", "sourceRoot": "",
"projectType": "application" "projectType": "application"
} }
}, },
"defaultProject": "material-angular-dashboard", "defaultProject": "wg-manager",
"cli": { "cli": {
"packageManager": "yarn" "packageManager": "yarn"
}, },

11
wg_dashboard_frontend/package.json

@ -16,18 +16,19 @@
"tlint:fix": "ng lint --fix", "tlint:fix": "ng lint --fix",
"slint": "stylelint --syntax scss ./**/*.scss", "slint": "stylelint --syntax scss ./**/*.scss",
"slint:fix": "stylelint --syntax scss --fix ./**/*.scss", "slint:fix": "stylelint --syntax scss --fix ./**/*.scss",
"lint": "ng lint && stylelint --syntax scss ./**/*.scss" "lint": "ng lint && stylelint --syntax scss ./**/*.scss",
"postinstall": "ngcc"
}, },
"pre-commit": "lint", "pre-commit": "lint",
"private": true, "private": false,
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/CreativeIT/material-angular-dashboard" "url": "https://github.com/perara/wg-manager"
}, },
"bugs": { "bugs": {
"url": "https://github.com/CreativeIT/material-angular-dashboard/issues" "url": "https://github.com/perara/wg-manager/issues"
}, },
"homepage": "https://github.com/CreativeIT/material-angular-dashboard", "homepage": "https://github.com/perara/wg-manager",
"dependencies": { "dependencies": {
"@angular/animations": "9.1.0", "@angular/animations": "9.1.0",
"@angular/cdk": "^9.2.0", "@angular/cdk": "^9.2.0",

Loading…
Cancel
Save