From 9779de5c7b38dd867c351bbe84e5bcf55d9f3845 Mon Sep 17 00:00:00 2001 From: SpaceManiac Date: Tue, 16 Apr 2024 20:49:56 -0700 Subject: [PATCH] Fix ssh-agent requirement by using https to clone docs (#347) --- package.json | 2 +- .../scripts/prepare_standalone_folders.sh | 6 +++--- tools/scripts/ssh-check.sh | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100755 tools/scripts/ssh-check.sh diff --git a/package.json b/package.json index 68a4e0dc7..79cbee2b3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "build": "npm run lint:configs && npx nx run-many --parallel=${NX_PARALLEL:-3} -t build", "test": "npm run lint:configs && npx nx run-many --parallel=${NX_PARALLEL:-3} -t test", "release:lib": "./wipe.sh && sh ./tools/scripts/bump-version.sh && npm run build && npm run lint && npm run test && read -p 'Enter OTP: ' otp && export NPM_CONFIG_OTP=$otp && npx nx release publish -g paima-sdk && npx nx release publish -g node-sdk", - "release:bin": "./wipe.sh && ./tools/scripts/ssh-check.sh && npm run lint:configs && npm run build && npx nx run-many --parallel=${NX_PARALLEL:-3} --projects=tag:type:binary -t release && mkdir -p ./bin && cp -r ./packages/engine/paima-standalone/packaged/@standalone/* ./bin" + "release:bin": "./wipe.sh && npm run lint:configs && npm run build && npx nx run-many --parallel=${NX_PARALLEL:-3} --projects=tag:type:binary -t release && mkdir -p ./bin && cp -rf ./packages/engine/paima-standalone/packaged/@standalone/* ./bin" }, "devDependencies": { "@eslint/eslintrc": "^2.1.2", diff --git a/packages/engine/paima-standalone/scripts/prepare_standalone_folders.sh b/packages/engine/paima-standalone/scripts/prepare_standalone_folders.sh index faf1d1781..f96ebf0c2 100644 --- a/packages/engine/paima-standalone/scripts/prepare_standalone_folders.sh +++ b/packages/engine/paima-standalone/scripts/prepare_standalone_folders.sh @@ -27,7 +27,7 @@ cp -r ../../batcher/batcher-standalone/packaged/@standalone/batcher-bin $BATCHER # Fetch documentation echo $DOC_PATH rm -rf $DOC_PATH -git clone --depth=1 git@github.com:PaimaStudios/paima-engine-docs.git $DOC_PATH +git clone --depth=1 https://github.com/PaimaStudios/paima-engine-docs.git $DOC_PATH # Remove everything except docs/home find $DOC_PATH/* -not -path "$DOC_PATH/docs*" -delete # Move the contents of docs/home to the root of $DOC_PATH @@ -40,7 +40,7 @@ rm -rf $DOC_PATH/.git* # Fetch templates rm -rf $TEMPLATES_PATH -git clone --depth=1 git@github.com:PaimaStudios/paima-standalone-templates.git $TEMPLATES_PATH +git clone --depth=1 https://github.com/PaimaStudios/paima-standalone-templates.git $TEMPLATES_PATH rm -rf $TEMPLATES_PATH/.git # Add in swagger static UI @@ -48,4 +48,4 @@ cp -r ../../../node_modules/swagger-ui-dist/ $SWAGGER_UI rm $SWAGGER_UI/index.html # this will get overwriten at runtime by swagger-ui-express # Copy CML wasm file -cp ../../../node_modules/@dcspark/cardano-multiplatform-lib-nodejs/cardano_multiplatform_lib_bg.wasm $PACKAGED_PATH \ No newline at end of file +cp ../../../node_modules/@dcspark/cardano-multiplatform-lib-nodejs/cardano_multiplatform_lib_bg.wasm $PACKAGED_PATH diff --git a/tools/scripts/ssh-check.sh b/tools/scripts/ssh-check.sh deleted file mode 100755 index 28c24f065..000000000 --- a/tools/scripts/ssh-check.sh +++ /dev/null @@ -1,8 +0,0 @@ -if ! pgrep -u "$USER" ssh-agent > /dev/null; then - echo "Error: ssh-agent not detected. Build process may hang. Are you sure you want to conitnue?" >&2 - echo "To run an ssh-agent, use the following:" - echo 'eval "$(ssh-agent -s)"' - echo "ssh-add ~/.ssh/your_github_key" - echo 'Press any key to continue once done' - read _ -fi