From 14e62998dd6384f32034af313db56271bee17b76 Mon Sep 17 00:00:00 2001 From: biffgaut <78155736+biffgaut@users.noreply.github.com> Date: Fri, 19 Aug 2022 16:26:31 -0400 Subject: [PATCH 1/3] Turn off V1 scripts and update developer docs (#775) --- CONTRIBUTING.md | 11 +++++------ deployment/align-version.sh | 8 ++++++++ deployment/allow-partial-builds.sh | 7 +++++++ deployment/build-patterns.sh | 8 ++++++++ deployment/v2/allow-partial-builds.sh | 26 ++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 6 deletions(-) create mode 100755 deployment/v2/allow-partial-builds.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aad4a1625..78eafbf70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -226,17 +226,16 @@ docker$ ./deployment/build-patterns.sh ### Partial Build -First run a clean Full Build before doing the partial build. +First run a clean Full Build before doing the partial build (the full build installs all the tools required +to build the library). Once you've initialized the Docker container by running a full build, you can +build and test individual constructs by following the steps below. ```console $ cd $ docker run -u root --rm --net=host -it -v $PWD:$PWD -w $PWD jsii/superchain:1-buster-slim-node14 -docker$ ./deployment/align-version.sh -docker$ cd source -docker$ export PATH=$(npm bin):$PATH -docker$ cd patterns/@aws-solutions-constructs/my-module +docker$ source ./deployment/v2/allow-partial-builds.sh +docker$ cd my-module docker$ npm run build+lint+test -docker$ ../../../../deployment/align-version.sh revert ``` ## Code of Conduct diff --git a/deployment/align-version.sh b/deployment/align-version.sh index e2fafa501..1e060532f 100755 --- a/deployment/align-version.sh +++ b/deployment/align-version.sh @@ -1,4 +1,12 @@ #!/bin/bash +echo !!!!!!!!!!!!!!!!!!!! +echo +echo Building V1 from the main branch is deprecated. +echo +echo Run source ./deployment/v2/align-version.sh to prepare the development environment for V2 +echo +exit 1 + set -euo pipefail deployment_dir=$(cd $(dirname $0) && pwd) diff --git a/deployment/allow-partial-builds.sh b/deployment/allow-partial-builds.sh index 4fda41d43..36f4a04ab 100755 --- a/deployment/allow-partial-builds.sh +++ b/deployment/allow-partial-builds.sh @@ -1,4 +1,11 @@ #!/bin/bash +echo !!!!!!!!!!!!!!!!!!!! +echo +echo Building V1 from the main branch is deprecated. +echo +echo Run source ./deployment/v2/allow-partial-build.sh to prepare the development environment for V2 +echo +exit 1 result=${PWD##*/} # to assign to a variable diff --git a/deployment/build-patterns.sh b/deployment/build-patterns.sh index cd9c5ed12..9e08e8a2b 100755 --- a/deployment/build-patterns.sh +++ b/deployment/build-patterns.sh @@ -1,4 +1,12 @@ #!/bin/bash +echo !!!!!!!!!!!!!!!!!!!! +echo +echo Building V1 from the main branch is deprecated. +echo +echo Run ./deployment/v2/build-patterns.sh to do a V2 build +echo +exit 1 + set -euo pipefail deployment_dir=$(cd $(dirname $0) && pwd) diff --git a/deployment/v2/allow-partial-builds.sh b/deployment/v2/allow-partial-builds.sh new file mode 100755 index 000000000..f2b9b1142 --- /dev/null +++ b/deployment/v2/allow-partial-builds.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +result=${PWD##*/} # to assign to a variable + +(return 0 2>/dev/null) && sourced=1 || sourced=0 + +if [ $sourced -ne 1 ] +then + echo + echo + echo 'Error - You must run this script with the source directive:' + echo + echo ' source ./deployment/v2/allow-partial-builds.sh' + echo +elif [ $result != 'aws-solutions-constructs' ] +then + echo + echo + echo 'Error - You must run this script from the aws-solutions-constructs folder.' + echo +else + ./deployment/v2/align-version.sh + cd source + export PATH=$(npm bin):$PATH + cd patterns/@aws-solutions-constructs +fi From 7008488308803d274e74d665355b089a35440cb9 Mon Sep 17 00:00:00 2001 From: AWS Solutions Constructs Automation Date: Wed, 24 Aug 2022 22:07:14 +0000 Subject: [PATCH 2/3] chore(release): 2.19.0 --- CHANGELOG.md | 2 ++ source/lerna.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0241e956..21e703afc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.19.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.18.0...v2.19.0) (2022-08-24) + ## [2.18.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.17.0...v2.18.0) (2022-08-19) (no changes in this release) diff --git a/source/lerna.json b/source/lerna.json index 18aa46e54..dbe371da9 100644 --- a/source/lerna.json +++ b/source/lerna.json @@ -6,5 +6,5 @@ "./patterns/@aws-solutions-constructs/*" ], "rejectCycles": "true", - "version": "2.18.0" + "version": "2.19.0" } From e72906b8cc3cb9065ebe3985ccf1d8a10e111d10 Mon Sep 17 00:00:00 2001 From: biffgaut <78155736+biffgaut@users.noreply.github.com> Date: Wed, 24 Aug 2022 18:09:05 -0400 Subject: [PATCH 3/3] chore(changelog): Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21e703afc..58c9668d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. See [standa ## [2.19.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.18.0...v2.19.0) (2022-08-24) +(no changes in this release) + ## [2.18.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.17.0...v2.18.0) (2022-08-19) (no changes in this release)