Skip to content

Commit

Permalink
Merge branch 'ng-deploy'
Browse files Browse the repository at this point in the history
Former-commit-id: 8aa1a01
  • Loading branch information
JohannesHoppe committed Aug 5, 2019
2 parents 61e7cb8 + 72570e2 commit 854d8cb
Show file tree
Hide file tree
Showing 69 changed files with 7,335 additions and 11,998 deletions.
4 changes: 0 additions & 4 deletions .angulardoc.json

This file was deleted.

32 changes: 17 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,31 @@ jobs:
build:

environment:
GITHUB_ORG: https://[email protected]/angular-schule
NG_CLI_ANALYTICS: ci
GITHUB_ORG: https://github.com/angular-schule
GITHUB_NAME: The Buildbot
GITHUB_EMAIL: [email protected]
NAME: angular-cli-ghpages

docker:
- image: circleci/node:10-browsers
- image: circleci/node:12-browsers

steps:
- checkout


- restore_cache:
key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "angular-testdrive/package.json" }}
- run: npm i --silent
- run: cd angular-testdrive && npm i --silent
key: dependency-cache-{{ checksum "src/package.json" }}
- run: cd src && npm i --silent
- save_cache:
key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "angular-testdrive/package.json" }}
key: dependency-cache-{{ checksum "src/package.json" }}
paths:
- node_modules
- angular-testdrive/node_modules


- run: cd angular-testdrive && npm run build
- run: chmod +x bin/angular-cli-ghpages
- run: cd angular-testdrive && ../bin/angular-cli-ghpages --repo "$GITHUB_ORG/$NAME.git" --name "$GITHUB_NAME" --email "$GITHUB_EMAIL" --dir=dist/angular-testdrive --cname=angular-cli-ghpages.angular.schule

- src/node_modules
- run: cd src && npm run build
- run: cd src && npm run test
- run: cd src/dist && sudo npm link

- run: sudo -E npm install -g @angular/cli@next
- run: sudo -E ng new your-angular-project --defaults
- run: cd your-angular-project && sudo -E npm link angular-cli-ghpages
- run: cd your-angular-project && sudo -E ng add angular-cli-ghpages
- run: cd your-angular-project && sudo -E ng deploy --repo="$GITHUB_ORG/$NAME.git" --name="$GITHUB_NAME" --email="$GITHUB_EMAIL" --cname=angular-cli-ghpages.angular.schule
File renamed without changes.
28 changes: 26 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
.DS_Store
node_modules
npm-debug.log
.tmp
.sass-cache
.DS_Store
.bash_history
*.swp
*.swo
*.d.ts

*.classpath
*.project
*.settings/
*.classpath
*.project
*.settings/

.vim/bundle
nvim/autoload
nvim/plugged
nvim/doc
nvim/swaps
nvim/colors
dist

/src/mini-testdrive/404.html
/src/mini-testdrive/CNAME
.angulardoc.json
4 changes: 0 additions & 4 deletions .npmignore

This file was deleted.

20 changes: 14 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,21 @@
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"cwd": "${workspaceRoot}/angular-testdrive",
"program": "${workspaceFolder}/bin/angular-cli-ghpages",
"name": "Launch Standalone Program",
"cwd": "${workspaceRoot}/src",
"program": "${workspaceFolder}/src/dist/angular-cli-ghpages",
"outFiles": [
"${workspaceFolder}/src/dist/**/*.js"
],
"args": [
"--dir=dist/angular-testdrive",
//"--no-silent",
//"--dry-run",
"--dir=mini-testdrive",
"--cname=angular-cli-ghpages.angular.schule"
]
],
"stopOnEntry": true,
"sourceMaps": true,
"preLaunchTask": "npm build",
}
]
}
}
13 changes: 13 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "build",
"path": "src/",
"label": "npm build"
}
]
}
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
The MIT License (MIT)

Copyright (c) 2017 Johannes Hoppe, https://angular.schule/
Copyright (c) 2017-2019 Johannes Hoppe
Copyright (c) 2019 Minko Gechev

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
Loading

0 comments on commit 854d8cb

Please sign in to comment.