From 1b365fef71683e84aa0dc247365968aecef1fed1 Mon Sep 17 00:00:00 2001 From: George Knee Date: Mon, 9 Oct 2023 15:26:50 +0100 Subject: [PATCH 1/8] use multiple netlify.toml files --- netlify.toml | 2 +- packages/payment-proxy-client/netlify.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 packages/payment-proxy-client/netlify.toml diff --git a/netlify.toml b/netlify.toml index 34e25cf3d..c41752b5d 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,2 +1,2 @@ [build] -ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- docs mkdocs.yml /packages/payment-proxy-client packages/nitro-rpc-client ; fi" +ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- docs mkdocs.yml ; fi" diff --git a/packages/payment-proxy-client/netlify.toml b/packages/payment-proxy-client/netlify.toml new file mode 100644 index 000000000..8531db003 --- /dev/null +++ b/packages/payment-proxy-client/netlify.toml @@ -0,0 +1,2 @@ +[build] +ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- . ; fi" From a4665b08cd5c8df8793881102f0e8c46c0e807c7 Mon Sep 17 00:00:00 2001 From: George Knee Date: Mon, 9 Oct 2023 15:40:29 +0100 Subject: [PATCH 2/8] try using relative path from base dir --- packages/payment-proxy-client/netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/payment-proxy-client/netlify.toml b/packages/payment-proxy-client/netlify.toml index 8531db003..9231a88a2 100644 --- a/packages/payment-proxy-client/netlify.toml +++ b/packages/payment-proxy-client/netlify.toml @@ -1,2 +1,2 @@ [build] -ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- . ; fi" +ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- packages/payment-proxy-client ; fi" From 59da6191f840af77521e4011591db061d038a153 Mon Sep 17 00:00:00 2001 From: George Knee Date: Mon, 9 Oct 2023 15:51:31 +0100 Subject: [PATCH 3/8] try again --- packages/payment-proxy-client/netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/payment-proxy-client/netlify.toml b/packages/payment-proxy-client/netlify.toml index 9231a88a2..7f775464d 100644 --- a/packages/payment-proxy-client/netlify.toml +++ b/packages/payment-proxy-client/netlify.toml @@ -1,2 +1,2 @@ [build] -ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- packages/payment-proxy-client ; fi" +ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- /packages/payment-proxy-client ; fi" From 7cfebf8a24bcd5dacce82e2858509ab497dd9d80 Mon Sep 17 00:00:00 2001 From: George Knee Date: Mon, 9 Oct 2023 16:31:58 +0100 Subject: [PATCH 4/8] trivial change should not trigger netlify sites --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index e36b75760..23874ac07 100644 --- a/readme.md +++ b/readme.md @@ -19,7 +19,7 @@ go-nitro > ⚠️ Go-nitro is pre-production software ⚠️ -Go-nitro can be consumed either as [library code](./node/readme.md) or started in an [independent process](./doc.go) and interfaced with remote procedure calls (recommended). +Go-nitro can be consumed either as [library code](./node/readme.md) or run as an [independent process](./doc.go) and interfaced with remote procedure calls (recommended). ## Contributing From e35b9f588350ca91093b75ac70c0219dc9431ae8 Mon Sep 17 00:00:00 2001 From: George Knee Date: Tue, 10 Oct 2023 09:29:11 +0100 Subject: [PATCH 5/8] use ./ --- packages/payment-proxy-client/netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/payment-proxy-client/netlify.toml b/packages/payment-proxy-client/netlify.toml index 7f775464d..15940edd1 100644 --- a/packages/payment-proxy-client/netlify.toml +++ b/packages/payment-proxy-client/netlify.toml @@ -1,2 +1,2 @@ [build] -ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- /packages/payment-proxy-client ; fi" +ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- ./packages/payment-proxy-client ; fi" From 19b9e88880d1c2f25d7e794b7d8f5e3b1fbe89e5 Mon Sep 17 00:00:00 2001 From: George Knee Date: Tue, 10 Oct 2023 09:55:20 +0100 Subject: [PATCH 6/8] go back to a single netlify.toml plus script --- netlify-build-ignore.sh | 13 +++++++++++++ netlify.toml | 2 +- packages/payment-proxy-client/netlify.toml | 2 -- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 netlify-build-ignore.sh delete mode 100644 packages/payment-proxy-client/netlify.toml diff --git a/netlify-build-ignore.sh b/netlify-build-ignore.sh new file mode 100644 index 000000000..817557e7c --- /dev/null +++ b/netlify-build-ignore.sh @@ -0,0 +1,13 @@ +if [ $COMMIT_REF == $CACHED_COMMIT_REF ] ; then exit 0 ; fi + +case ${SITE_NAME} in + + nitrodocs) + git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- docs mkdocs.yml + ;; + + nitro-payment-demo) + git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- ./packages/payment-proxy-client + ;; + +esac \ No newline at end of file diff --git a/netlify.toml b/netlify.toml index c41752b5d..724a46c3a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,2 +1,2 @@ [build] -ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- docs mkdocs.yml ; fi" +ignore = "bash ./netlify-build-ignore.sh" diff --git a/packages/payment-proxy-client/netlify.toml b/packages/payment-proxy-client/netlify.toml deleted file mode 100644 index 15940edd1..000000000 --- a/packages/payment-proxy-client/netlify.toml +++ /dev/null @@ -1,2 +0,0 @@ -[build] -ignore = "if [ ${COMMIT_REF} == ${CACHED_COMMIT_REF} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- ./packages/payment-proxy-client ; fi" From 830a63b2cb862c12100d5f76bf6e2a6f4bafd8c3 Mon Sep 17 00:00:00 2001 From: George Knee Date: Tue, 10 Oct 2023 09:58:21 +0100 Subject: [PATCH 7/8] trivial change --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 23874ac07..01ae73e04 100644 --- a/readme.md +++ b/readme.md @@ -13,7 +13,7 @@ go-nitro - listens to blockchain events - listens for counterparty messages - stores important data to allow for recovery from counterparty inactivity / malice -- understands how to perform these functions safely without risking any funds +- understands how to perform these functions safely, without risking any funds ## Usage From dcf1165222eea767cddf64d81b51bbfe6940af1e Mon Sep 17 00:00:00 2001 From: George Knee Date: Tue, 10 Oct 2023 10:02:05 +0100 Subject: [PATCH 8/8] bump version (patch) --- packages/nitro-protocol/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nitro-protocol/package.json b/packages/nitro-protocol/package.json index 1f410402c..af2e1ae13 100644 --- a/packages/nitro-protocol/package.json +++ b/packages/nitro-protocol/package.json @@ -1,6 +1,6 @@ { "name": "@statechannels/nitro-protocol", - "version": "2.0.0-alpha.5", + "version": "2.0.1-alpha.5", "description": "Smart contracts and typescript libraries for nitro state channel protocol.", "keywords": [], "homepage": "https://github.com/statechannels/go-nitro",