From b160dc5f67f368aef9caaa15d7860bd6b1e26ba8 Mon Sep 17 00:00:00 2001 From: Mathieu ANCELIN Date: Wed, 30 Oct 2019 16:09:25 +0100 Subject: [PATCH] Prepare the release of Otoroshi version 1.4.13 --- clients/tcp-udp-tunnel-client-gui/yarn.lock | 48 ++++++++------------- clients/tcp-udp-tunnel-client/package.json | 2 +- clients/tcp-udp-tunnel-client/yarn.lock | 2 +- scripts/release/release.js | 24 +++++------ 4 files changed, 32 insertions(+), 44 deletions(-) diff --git a/clients/tcp-udp-tunnel-client-gui/yarn.lock b/clients/tcp-udp-tunnel-client-gui/yarn.lock index 2b9422e46a..a1b8dac8d4 100644 --- a/clients/tcp-udp-tunnel-client-gui/yarn.lock +++ b/clients/tcp-udp-tunnel-client-gui/yarn.lock @@ -214,7 +214,7 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -colors@^1.4.0: +colors@1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== @@ -378,7 +378,7 @@ electron-osx-sign@^0.4.11: minimist "^1.2.0" plist "^3.0.1" -electron-packager@^14.0.6: +electron-packager@14.0.6: version "14.0.6" resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-14.0.6.tgz#e187f2ef83cc29a97a0f940b7c3bb5e4edc8a8e2" integrity sha512-X+ikV+TnnNkIrK93vOjsjPeykCQBFxBS7LXKMTE1s62rXWirGMdjWL+edVkBOMRkH0ROJyFmWM28Dpj6sfEg+A== @@ -401,7 +401,7 @@ electron-packager@^14.0.6: semver "^6.0.0" yargs-parser "^13.0.0" -electron@^6.0.12: +electron@6.0.12: version "6.0.12" resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.12.tgz#85bf0061e32f660256cfde95488f1cb75253bc94" integrity sha512-70ODZa1RP6K0gE9IV9YLCXPSyhLjXksCuYSSPb3MljbfwfHo5uE6X0CGxzm+54YuPdE2e7EPnWZxOOsJYrS5iQ== @@ -471,7 +471,7 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -faker@^4.1.0: +faker@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f" integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8= @@ -530,6 +530,15 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" +fs-extra@8.1.0, fs-extra@^8.0.1, fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^4.0.0, fs-extra@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" @@ -548,15 +557,6 @@ fs-extra@^7.0.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^8.0.1, fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -673,7 +673,7 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-proxy-agent@^3.0.0: +https-proxy-agent@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz#0106efa5d63d6d6f3ab87c999fa4877a3fd1ff97" integrity sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ== @@ -735,11 +735,6 @@ is-utf8@^0.2.0: resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= -is-wsl@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" - integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== - isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -850,7 +845,7 @@ lodash.get@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= -lodash@^4.17.15: +lodash@4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -935,7 +930,7 @@ mkdirp@0.5.1, mkdirp@^0.5.1: dependencies: minimist "0.0.8" -moment@^2.24.0: +moment@2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== @@ -950,7 +945,7 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -node-fetch@^2.6.0: +node-fetch@2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== @@ -1010,13 +1005,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -open@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.0.0.tgz#7e52999b14eb73f90f0f0807fe93897c4ae73ec9" - integrity sha512-K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ== - dependencies: - is-wsl "^2.1.0" - p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" @@ -1606,7 +1594,7 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -ws@^7.1.2: +ws@7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/ws/-/ws-7.1.2.tgz#c672d1629de8bb27a9699eb599be47aeeedd8f73" integrity sha512-gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg== diff --git a/clients/tcp-udp-tunnel-client/package.json b/clients/tcp-udp-tunnel-client/package.json index 643e433129..15ed6559c9 100644 --- a/clients/tcp-udp-tunnel-client/package.json +++ b/clients/tcp-udp-tunnel-client/package.json @@ -9,7 +9,7 @@ "dev": "nodemon client.js", "start": "node client.js", "start-and-watch": "nodemon client.js", - "pkg": "pkg . && rm -rf ./binaries && mkdir -p ./binaries && mv otoroshi-tcp-tunnel-cli-* ./binaries/" + "pkg": "pkg . && rm -rf ./binaries && mkdir -p ./binaries && mv otoroshi-tcp-udp-tunnel-cli-* ./binaries/" }, "dependencies": { "colors": "1.3.3", diff --git a/clients/tcp-udp-tunnel-client/yarn.lock b/clients/tcp-udp-tunnel-client/yarn.lock index fc326f207e..60aaa53ddf 100644 --- a/clients/tcp-udp-tunnel-client/yarn.lock +++ b/clients/tcp-udp-tunnel-client/yarn.lock @@ -1365,7 +1365,7 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lodash@^4.17.15: +lodash@4.17.15, lodash@^4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== diff --git a/scripts/release/release.js b/scripts/release/release.js index c92b0ada83..4a2ae32da0 100644 --- a/scripts/release/release.js +++ b/scripts/release/release.js @@ -223,12 +223,12 @@ async function buildTcpTunnelingCli(location, version) { source $NVM_TOOL nvm install 12.7.0 nvm use 12.7.0 - cd ${location}/clients/tcp-tunnel-client + cd ${location}/clients/tcp-udp-tunnel-client yarn install yarn pkg - cp -v "$LOCATION/clients/tcp-tunnel-client/binaries/otoroshi-tcp-tunnel-cli-linux" "$LOCATION/release-$VERSION/" - cp -v "$LOCATION/clients/tcp-tunnel-client/binaries/otoroshi-tcp-tunnel-cli-macos" "$LOCATION/release-$VERSION/" - cp -v "$LOCATION/clients/tcp-tunnel-client/binaries/otoroshi-tcp-tunnel-cli-win.exe" "$LOCATION/release-$VERSION/" + cp -v "$LOCATION/clients/tcp-udp-tunnel-client/binaries/otoroshi-tcp-udp-tunnel-cli-linux" "$LOCATION/release-$VERSION/" + cp -v "$LOCATION/clients/tcp-udp-tunnel-client/binaries/otoroshi-tcp-udp-tunnel-cli-macos" "$LOCATION/release-$VERSION/" + cp -v "$LOCATION/clients/tcp-udp-tunnel-client/binaries/otoroshi-tcp-udp-tunnel-cli-win.exe" "$LOCATION/release-$VERSION/" `, location, { @@ -245,11 +245,11 @@ async function buildTcpTunnelingCliGUI(location, version) { source $NVM_TOOL nvm install 12.7.0 nvm use 12.7.0 - cd ${location}/clients/tcp-tunnel-client-gui + cd ${location}/clients/tcp-udp-tunnel-client-gui yarn install yarn dist-mac - hdiutil create -format UDZO -srcfolder "$LOCATION/clients/tcp-tunnel-client-gui/dist/otoroshi-tunneling-client-darwin-x64/otoroshi-tunneling-client.app" "$LOCATION/release-$VERSION/otoroshi-tunneling-client.dmg" - zip -r "$LOCATION/release-$VERSION/otoroshi-tunneling-client.zip" "$LOCATION/clients/tcp-tunnel-client-gui/dist/otoroshi-tunneling-client-darwin-x64/otoroshi-tunneling-client.app" + hdiutil create -format UDZO -srcfolder "$LOCATION/clients/tcp-udp-tunnel-client-gui/dist/otoroshi-tunneling-client-darwin-x64/otoroshi-tunneling-client.app" "$LOCATION/release-$VERSION/otoroshi-tunneling-client.dmg" + zip -r "$LOCATION/release-$VERSION/otoroshi-tunneling-client.zip" "$LOCATION/clients/tcp-udp-tunnel-client-gui/dist/otoroshi-tunneling-client-darwin-x64/otoroshi-tunneling-client.app" `, location, { @@ -319,17 +319,17 @@ async function createGithubRelease(version, location) { }) }).then(r => r.json()).then(r => { console.log(r); - return uploadAllFiles(r, location); + return uploadAllFiles(r, location, version); }); } -async function uploadAllFiles(release, location) { +async function uploadAllFiles(release, location, to) { await uploadFilesToRelease(release, { name: 'otoroshi.jar', path: path.resolve(location, `otoroshi.jar`) }); await uploadFilesToRelease(release, { name: `otoroshi-${to}.zip`, path: path.resolve(location, `otoroshi-${to}.zip`) }); await uploadFilesToRelease(release, { name: `otoroshi-manual-${to}.zip`, path: path.resolve(location, `otoroshi-manual-${to}.zip`) }); - await uploadFilesToRelease(release, { name: `otoroshi-tcp-tunnel-cli-linux`, path: path.resolve(location, `otoroshi-tcp-tunnel-cli-linux`) }); - await uploadFilesToRelease(release, { name: `otoroshi-tcp-tunnel-cli-macos`, path: path.resolve(location, `otoroshi-tcp-tunnel-cli-macos`) }); - await uploadFilesToRelease(release, { name: `otoroshi-tcp-tunnel-cli-win.exe`, path: path.resolve(location, `otoroshi-tcp-tunnel-cli-win.exe`) }); + await uploadFilesToRelease(release, { name: `otoroshi-tcp-udp-tunnel-cli-linux`, path: path.resolve(location, `otoroshi-tcp-udp-tunnel-cli-linux`) }); + await uploadFilesToRelease(release, { name: `otoroshi-tcp-udp-tunnel-cli-macos`, path: path.resolve(location, `otoroshi-tcp-udp-tunnel-cli-macos`) }); + await uploadFilesToRelease(release, { name: `otoroshi-tcp-udp-tunnel-cli-win.exe`, path: path.resolve(location, `otoroshi-tcp-udp-tunnel-cli-win.exe`) }); await uploadFilesToRelease(release, { name: `otoroshi-tunneling-client.dmg`, path: path.resolve(location, `otoroshi-tunneling-client.dmg`) }); await uploadFilesToRelease(release, { name: `otoroshi-tunneling-client.zip`, path: path.resolve(location, `otoroshi-tunneling-client.zip`) }); }