From 2f548243fcf9e51326a2456b9a50175abd7a4608 Mon Sep 17 00:00:00 2001 From: Per-Arne Andersen Date: Wed, 30 Dec 2020 20:53:03 +0100 Subject: [PATCH] * Few travis fixes * Preparing upgrade to angular 10 --- .travis.yml | 9 +++++++-- scripts/ci.sh | 0 wg_dashboard_frontend/angular.json | 12 ++++++------ wg_dashboard_frontend/package.json | 11 ++++++----- 4 files changed, 19 insertions(+), 13 deletions(-) mode change 100644 => 100755 scripts/ci.sh diff --git a/.travis.yml b/.travis.yml index bd6fd48..3b32864 100644 --- a/.travis.yml +++ b/.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 env: global: - DOCKER_REPO=perara/wg-manager before_install: - - curl -fsSL https://get.docker.com | sh - echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json - mkdir -p $HOME/.docker - echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json diff --git a/scripts/ci.sh b/scripts/ci.sh old mode 100644 new mode 100755 diff --git a/wg_dashboard_frontend/angular.json b/wg_dashboard_frontend/angular.json index e2d1284..f5b79f5 100644 --- a/wg_dashboard_frontend/angular.json +++ b/wg_dashboard_frontend/angular.json @@ -3,7 +3,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "material-angular-dashboard": { + "wg-manager": { "root": "", "sourceRoot": "src", "projectType": "application", @@ -56,19 +56,19 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "material-angular-dashboard:build", + "browserTarget": "wg-manager:build", "proxyConfig": "proxy.conf.json" }, "configurations": { "production": { - "browserTarget": "material-angular-dashboard:build:production" + "browserTarget": "wg-manager:build:production" } } }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "material-angular-dashboard:build" + "browserTarget": "wg-manager:build" } }, "lint": { @@ -84,13 +84,13 @@ } } }, - "material-angular-dashboard-e2e": { + "wg-manager-e2e": { "root": "", "sourceRoot": "", "projectType": "application" } }, - "defaultProject": "material-angular-dashboard", + "defaultProject": "wg-manager", "cli": { "packageManager": "yarn" }, diff --git a/wg_dashboard_frontend/package.json b/wg_dashboard_frontend/package.json index e674208..296f0c1 100644 --- a/wg_dashboard_frontend/package.json +++ b/wg_dashboard_frontend/package.json @@ -16,18 +16,19 @@ "tlint:fix": "ng lint --fix", "slint": "stylelint --syntax scss ./**/*.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", - "private": true, + "private": false, "repository": { "type": "git", - "url": "https://github.com/CreativeIT/material-angular-dashboard" + "url": "https://github.com/perara/wg-manager" }, "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": { "@angular/animations": "9.1.0", "@angular/cdk": "^9.2.0",