Skip to content

Commit

Permalink
fix: Fixing lerna setup for proper mono-repo build/clean/bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
Charlie Sperbeck authored and whilke committed Feb 15, 2019
1 parent 3ac22de commit d8e0977
Show file tree
Hide file tree
Showing 75 changed files with 8,489 additions and 10,503 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,11 @@ node_modules
dist
system/lerna-debug\.log
*.tgz
*.vsix


node_modules/
lerna-debug.log
npm-debug.log
lib
.idea
*.vsix
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.21](https://github.com/csperbeck/azure-bake/compare/v0.1.5...v0.1.21) (2019-02-15)


### Bug Fixes

* Added util to lookup current ingredient source value ([b3f2ba0](https://github.com/csperbeck/azure-bake/commit/b3f2ba0))
* **system:** Fixed [#12](https://github.com/csperbeck/azure-bake/issues/12) - bake.yaml with no variables defined was failing ([500b5a7](https://github.com/csperbeck/azure-bake/commit/500b5a7))
* Adds 3 ingredients for web apps (webapp, traffic manager, custom hostnames with ssl), teaches core-utils how to recognize a primary region, and cleans up boilerplate code for deploying arm templates through ingredients into a helper package. ([0304458](https://github.com/csperbeck/azure-bake/commit/0304458))
* fixes truncation of environment file ([#17](https://github.com/csperbeck/azure-bake/issues/17)) ([fea40e6](https://github.com/csperbeck/azure-bake/commit/fea40e6))
* fixing lerna public publish ([341ca98](https://github.com/csperbeck/azure-bake/commit/341ca98))
* fixing peerDep for core module ([a2cea1c](https://github.com/csperbeck/azure-bake/commit/a2cea1c))
* refactored template to source/BakeVariable ([9d9b405](https://github.com/csperbeck/azure-bake/commit/9d9b405))
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@
* [@azbake/ingredient-traffic-manager](./ingredient/ingredient-traffic-manager/CHANGELOG.md)
* [@azbake/ingredient-host-names](./ingredient/ingredient-host-names/CHANGELOG.md)

## Tools

[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)

[![Generic badge](https://img.shields.io/badge/Azure-Cloud-Blue.svg)](https://shields.io/)

## Build

**_Build Commands_ to be executed from the project root**

For Clean Build with Local and External Dependency Loading: `npm run clean:build`
For Build with Local and External Dependency Loading: `npm run load:build`
For Build Only: `npm run build`

## Development Testing

After a _Lerna_ `clean:build` navigate to `system/dist` and run `node index.js` and append your bake commands including `mix --name "my_deployment:latest" --runtime "latest" ./package/test.yaml`. All dependencies should be linked through _Lerna_ as long as they have been properly setup and run through the build process.

## Install
```
npm i -g azure-bake
Expand Down
9 changes: 8 additions & 1 deletion arm-helper/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.21](https://github.com/HomecareHomebase/azure-bake/compare/v0.1.5...v0.1.21) (2019-02-15)


### Bug Fixes

* Adds 3 ingredients for web apps (webapp, traffic manager, custom hostnames with ssl), teaches core-utils how to recognize a primary region, and cleans up boilerplate code for deploying arm templates through ingredients into a helper package. ([0304458](https://github.com/HomecareHomebase/azure-bake/commit/0304458))
2 changes: 1 addition & 1 deletion arm-helper/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions arm-helper/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"name": "@azbake/arm-helper",
"description": "Helper class for installing ARM templates through Bake.",
"version": "0.0.2",
"main": "dist/arm-helper.js",
"version": "0.1.21",
"main": "src/dist/arm-helper.js",
"typings": "src/arm-helper.ts",
"directories": {
"lib": "dist"
},
"author": "HCHB",
"license": "MIT",
"repository": {
Expand All @@ -15,18 +19,19 @@
"homepage": "https://github.com/HomecareHomebase/azure-bake",
"scripts": {
"upload": "tsc -p ./src && npm --no-git-tag-version version patch && npm publish --access public",
"compile": "tsc",
"compile": "tsc -p ./src",
"watch": "tsc -w -p ./src"
},
"peerDependencies": {
"@azbake/core": "0.*",
"@azure/arm-resources": "^1.0.1"
"@azure/arm-resources": "0.*"
},
"devDependencies": {
"@types/node": "^10.12.18"
},
"dependencies": {
"@azure/arm-resources": "^1.0.0"
"@azbake/core": "^0.1.21",
"@azure/arm-resources": "^1.0.1"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 15 additions & 0 deletions arm-helper/sshpk-conv
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")

case `uname` in
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
esac

if [ -x "$basedir/node" ]; then
"$basedir/node" "$basedir/node_modules/sshpk/bin/sshpk-conv" "$@"
ret=$?
else
node "$basedir/node_modules/sshpk/bin/sshpk-conv" "$@"
ret=$?
fi
exit $ret
7 changes: 7 additions & 0 deletions arm-helper/sshpk-conv.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@IF EXIST "%~dp0\node.exe" (
"%~dp0\node.exe" "%~dp0\node_modules\sshpk\bin\sshpk-conv" %*
) ELSE (
@SETLOCAL
@SET PATHEXT=%PATHEXT:;.JS;=;%
node "%~dp0\node_modules\sshpk\bin\sshpk-conv" %*
)
15 changes: 15 additions & 0 deletions arm-helper/sshpk-sign
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")

case `uname` in
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
esac

if [ -x "$basedir/node" ]; then
"$basedir/node" "$basedir/node_modules/sshpk/bin/sshpk-sign" "$@"
ret=$?
else
node "$basedir/node_modules/sshpk/bin/sshpk-sign" "$@"
ret=$?
fi
exit $ret
7 changes: 7 additions & 0 deletions arm-helper/sshpk-sign.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@IF EXIST "%~dp0\node.exe" (
"%~dp0\node.exe" "%~dp0\node_modules\sshpk\bin\sshpk-sign" %*
) ELSE (
@SETLOCAL
@SET PATHEXT=%PATHEXT:;.JS;=;%
node "%~dp0\node_modules\sshpk\bin\sshpk-sign" %*
)
15 changes: 15 additions & 0 deletions arm-helper/sshpk-verify
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")

case `uname` in
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
esac

if [ -x "$basedir/node" ]; then
"$basedir/node" "$basedir/node_modules/sshpk/bin/sshpk-verify" "$@"
ret=$?
else
node "$basedir/node_modules/sshpk/bin/sshpk-verify" "$@"
ret=$?
fi
exit $ret
7 changes: 7 additions & 0 deletions arm-helper/sshpk-verify.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@IF EXIST "%~dp0\node.exe" (
"%~dp0\node.exe" "%~dp0\node_modules\sshpk\bin\sshpk-verify" %*
) ELSE (
@SETLOCAL
@SET PATHEXT=%PATHEXT:;.JS;=;%
node "%~dp0\node_modules\sshpk\bin\sshpk-verify" %*
)
15 changes: 15 additions & 0 deletions arm-helper/uuid
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh
basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")

case `uname` in
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
esac

if [ -x "$basedir/node" ]; then
"$basedir/node" "$basedir/node_modules/uuid/bin/uuid" "$@"
ret=$?
else
node "$basedir/node_modules/uuid/bin/uuid" "$@"
ret=$?
fi
exit $ret
7 changes: 7 additions & 0 deletions arm-helper/uuid.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@IF EXIST "%~dp0\node.exe" (
"%~dp0\node.exe" "%~dp0\node_modules\uuid\bin\uuid" %*
) ELSE (
@SETLOCAL
@SET PATHEXT=%PATHEXT:;.JS;=;%
node "%~dp0\node_modules\uuid\bin\uuid" %*
)
13 changes: 13 additions & 0 deletions core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.1.21](https://github.com/HomecareHomebase/azure-bake/compare/v0.1.5...v0.1.21) (2019-02-15)


### Bug Fixes

* Adds 3 ingredients for web apps (webapp, traffic manager, custom hostnames with ssl), teaches core-utils how to recognize a primary region, and cleans up boilerplate code for deploying arm templates through ingredients into a helper package. ([0304458](https://github.com/HomecareHomebase/azure-bake/commit/0304458))
* fixing lerna public publish ([341ca98](https://github.com/HomecareHomebase/azure-bake/commit/341ca98))






## [0.1.17](https://github.com/HomecareHomebase/azure-bake/compare/@azbake/core@0.1.15...@azbake/core@0.1.17) (2019-02-12)


Expand Down
Loading

0 comments on commit d8e0977

Please sign in to comment.