From 858dfb8778c3ff1440443fa47a87fd828d34ad8a Mon Sep 17 00:00:00 2001 From: Jungho Bang Date: Mon, 20 Nov 2023 15:01:28 -0800 Subject: [PATCH] define codeflow job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 74d75fdcf3f891cbe55403efb1136fed5c89947f Merge: 53cedd28 e5b80fb3 Author: Jungho Bang Date: Mon Nov 20 14:18:56 2023 -0800 Merge pull request #4 from wallet/jungho/asdfasdfasdf shared commit e5b80fb308e7176fcf8cc4a297e477cb5521184a Author: Jungho Bang Date: Mon Nov 20 14:15:45 2023 -0800 shared commit 53cedd285560a2ed2e74ed173aaa9b1b3301e0ae Author: Jungho Bang Date: Mon Nov 20 14:05:36 2023 -0800 fix (#3) * no slack error * config file * ugh commit 864ddc9d3b23f2ae3435226c6357c459e9331e42 Merge: a9f34b3d 85813135 Author: Jungho Bang Date: Mon Nov 20 13:18:44 2023 -0800 Merge pull request #2 from wallet/jungho/codeflow-build ls commit 85813135cdba5d477f03fac3acc7cf521dcf2b06 Author: Jungho Bang Date: Mon Nov 20 13:17:39 2023 -0800 sadfasdfadf commit dbaea5013c4e1d8a1f0b3ec29c97e32ff21b8b1a Author: Jungho Bang Date: Mon Nov 20 13:17:20 2023 -0800 asdfasdf commit 384ab2e54a04d2b33c94aea3558342b8e59f18af Author: Jungho Bang Date: Mon Nov 20 13:02:45 2023 -0800 WORKDIR /sdk commit 64dc76525124ddba8ad714965861b54ffc990996 Author: Jungho Bang Date: Mon Nov 20 12:58:12 2023 -0800 workdir /sdk commit 70dd5982f4f7fc4a7dc813355c2d4eb61b57b8a7 Author: Jungho Bang Date: Mon Nov 20 12:57:46 2023 -0800 udpate copy path commit 3d686cf8335f40e200b138fc0666f2d7bbc689ad Author: Jungho Bang Date: Mon Nov 20 12:48:38 2023 -0800 ls commit a9f34b3d833e7236697ff40229d32590c041a506 Merge: 40d91973 f2e819b7 Author: Jungho Bang Date: Mon Nov 20 12:40:59 2023 -0800 Merge pull request #1 from wallet/jungho/codeflow codeflow commit f2e819b73cb68b9ef9909dd5835845fb2a4a314e Author: Jungho Bang Date: Mon Nov 20 12:32:41 2023 -0800 cbhq commit a9116b3dc0afb2ecb6fd322032dca591c0c63ba9 Author: Jungho Bang Date: Mon Nov 20 12:29:08 2023 -0800 rename it as cbhq/wallet-sdk commit 74ccadefb9a8e2a9a1c6e480f6cf8bf089cb65d0 Author: Jungho Bang Date: Mon Nov 20 12:13:24 2023 -0800 update version only commit 58a325c505383945beb1c6bd79bf43bcc903df00 Author: Jungho Bang Date: Mon Nov 20 12:06:08 2023 -0800 run on the wallet-sdk dir commit d3355609572bca6249e37f203cc61067e2290596 Author: Jungho Bang Date: Mon Nov 20 11:54:43 2023 -0800 update name as well commit 529c0a257e62195911e80581b4818aef29c43c29 Author: Jungho Bang Date: Mon Nov 20 11:46:52 2023 -0800 cleanup commit bdac83c0b4bb1c45b469495b322d11c43e467c2d Author: Jungho Bang Date: Mon Nov 20 11:41:13 2023 -0800 update release.sh to take `canary` # Conflicts: # scripts/release.sh commit 3ec111004675fc592f52298f7cd6983e842d3dc1 Author: Jungho Bang Date: Mon Nov 20 11:17:42 2023 -0800 cleanup commit 091bcb585f679b9aa907ac6f5e1ff7831c929721 Author: Jungho Bang Date: Mon Nov 20 11:06:05 2023 -0800 add canary option to release.sh commit 5c74bd5a165e46699d3803b0cb795649c913b5a7 Author: Jungho Bang Date: Mon Nov 20 10:40:49 2023 -0800 cleanup commit 6269c0c0b1bdb8ff395c97d6fa57aea65c2cdfeb Author: Jungho Bang Date: Fri Nov 17 15:28:25 2023 -0800 codeflow job (#2) Update README.md update dockerfile autobuild: true WORKDIR /packages/wallet-sdk COPY . . asdfasdfasdfadfsa asdfafwa qwerR2DCewae XC tsconfig module NodeNext tsconfig path SVG issue publish? asdfsd a WORKDIR / 이거일듯 시발 --- .codeflow.yml | 11 +++++++++-- packages/wallet-sdk/package.json | 2 +- .../ui/components/Snackbar/Snackbar.tsx | 4 ++-- scripts/deploy.yml | 3 +++ scripts/publish-canary.Dockerfile | 18 ++++++++++++++++++ scripts/release.sh | 11 +++++++++++ tsconfig.base.json | 2 +- 7 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 scripts/deploy.yml create mode 100644 scripts/publish-canary.Dockerfile diff --git a/.codeflow.yml b/.codeflow.yml index 69524c63a5..5ec780dd0d 100644 --- a/.codeflow.yml +++ b/.codeflow.yml @@ -3,5 +3,12 @@ secure: upstream_repository: coinbase/coinbase-wallet-sdk operate: slack_channels: - - "#wallet-squad-build" - - "#wallet-feedback" + - "#wallet-squad-w3i" +build: + engines: + - BaldurNode: + name: package-wallet-sdk + path: "./scripts/publish-canary.Dockerfile" + compute_type: BUILD_GENERAL1_SMALL + context: "./" + autobuild: true diff --git a/packages/wallet-sdk/package.json b/packages/wallet-sdk/package.json index 1113478aa9..a186012e76 100644 --- a/packages/wallet-sdk/package.json +++ b/packages/wallet-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@coinbase/wallet-sdk", - "version": "3.9.0-canary.5", + "version": "3.9.0", "description": "Coinbase Wallet JavaScript SDK", "keywords": [ "cipher", diff --git a/packages/wallet-sdk/src/relay/walletlink/ui/components/Snackbar/Snackbar.tsx b/packages/wallet-sdk/src/relay/walletlink/ui/components/Snackbar/Snackbar.tsx index b23bf9fc6a..50c613ede4 100644 --- a/packages/wallet-sdk/src/relay/walletlink/ui/components/Snackbar/Snackbar.tsx +++ b/packages/wallet-sdk/src/relay/walletlink/ui/components/Snackbar/Snackbar.tsx @@ -26,8 +26,8 @@ export interface SnackbarMenuItem { svgWidth: string; svgHeight: string; path: string; - defaultFillRule: string; - defaultClipRule: string; + defaultFillRule: 'inherit' | 'evenodd'; + defaultClipRule: 'inherit' | 'evenodd'; onClick: () => void; } diff --git a/scripts/deploy.yml b/scripts/deploy.yml new file mode 100644 index 0000000000..ce47cd97fe --- /dev/null +++ b/scripts/deploy.yml @@ -0,0 +1,3 @@ +engine: Node +build_name: package-wallet-sdk +continuous: true diff --git a/scripts/publish-canary.Dockerfile b/scripts/publish-canary.Dockerfile new file mode 100644 index 0000000000..d6ea539c3e --- /dev/null +++ b/scripts/publish-canary.Dockerfile @@ -0,0 +1,18 @@ +FROM 652969937640.dkr.ecr.us-east-1.amazonaws.com/containers/node:v18 + +RUN apt-get update \ + && apt-get install -y jq + +COPY . ./sdk + +WORKDIR /sdk + +RUN yarn install + +RUN yarn release -- canary + +RUN npm pack -w @coinbase/wallet-sdk + +RUN mv /sdk /shared + +WORKDIR /shared diff --git a/scripts/release.sh b/scripts/release.sh index 235bd4f364..0f3d403fd7 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -35,6 +35,17 @@ if [ $branch == $mainBranch ]; then echo "=================================================" echo -e " ${GREEN} run 'npm publish'" echo "=================================================" +elif [[ " $* " == *" canary "* ]]; then + echo -e "Preparing canary release..." + cd ./packages/wallet-sdk + timestamp=$(date +%s) + newVersion=$(jq -r '.version' package.json)"-canary.$timestamp" + jq ".version = \"$newVersion\"" package.json > temp.json && \ + mv temp.json package.json + echo "Canary version updated to $newVersion" + + yarn install + yarn build else echo -e "${RED}⚠️ Need to publish from ${mainBranch} branch" echo -e "${REDBOLD}Checking out ${mainBranch}... " diff --git a/tsconfig.base.json b/tsconfig.base.json index b5bfb27a81..e8ceb38f65 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -14,7 +14,7 @@ "dom.iterable", "es2016", ], - "module": "CommonJS", + "module": "NodeNext", "moduleResolution": "NodeNext", "resolveJsonModule": true, "skipLibCheck": true,