From 1d1abe0c5ec8baf357c3311e3436669af576ef46 Mon Sep 17 00:00:00 2001 From: "malonso@cloudflare.com" Date: Fri, 5 Mar 2021 08:45:58 -0600 Subject: [PATCH] placeholder --- CHANGELOG.md | 14 ++++++++++++++ Cargo.lock | 10 +++++----- Cargo.toml | 2 +- RELEASE_CHECKLIST.md | 14 ++++++++------ npm/binary.js | 2 +- npm/npm-shrinkwrap.json | 4 ++-- npm/package.json | 2 +- 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc64c6141..54b9b2570 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## 1.14.1 + +- ### Fixes + + - **revert default install location change - [xortive], [pull/1798]** + + In 1.14.0, we changed the default install location from `~/.wrangler` to `node_modules`, + to allow `npx wrangler` to use the pinned version in a project's dependencies. It seems that + this is causing issues, so we're rolling it back in favor of having folks who want this behavior, + to specify a the install location in the `config` section of package.json. We'll document this soon. + + [xortive]: https://github.com/xortive + [pull/1798]: https://github.com/cloudflare/wrangler/pull/1798 + ## 1.14.0 - ### Features diff --git a/Cargo.lock b/Cargo.lock index da6cd046d..c8504ba72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,9 +73,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "d3340571769500ddef1e94b45055fabed6b08a881269b7570c830b8f32ef84ef" dependencies = [ "proc-macro2", "quote", @@ -2507,9 +2507,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5" dependencies = [ "proc-macro2", "quote", @@ -3205,7 +3205,7 @@ dependencies = [ [[package]] name = "wrangler" -version = "1.14.0" +version = "1.14.1" dependencies = [ "assert_cmd", "atty", diff --git a/Cargo.toml b/Cargo.toml index 11584a4ec..2aa616757 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wrangler" -version = "1.14.0" +version = "1.14.1" authors = ["The Wrangler Team ", "Avery Harnish ", "Ashley Lewis ", "Ashley Williams ", "Nat Davidson ", "Steve Manuel "] edition = "2018" license = "MIT/Apache-2.0" diff --git a/RELEASE_CHECKLIST.md b/RELEASE_CHECKLIST.md index 2ed46b34c..ed806d121 100644 --- a/RELEASE_CHECKLIST.md +++ b/RELEASE_CHECKLIST.md @@ -43,14 +43,21 @@ Most of your comments will be about the changelog. Once the PR is finalized and 1. If you made changes, squash or fixup all changes into a single commit. 1. Run `git push` and wait for CI to pass. +## Merge + +1. Hit the big green Merge button on the release PR. +1. `git checkout master` and `git pull --rebase origin master` ### Tag and build release This part of the release process is handled by GitHub Actions, and our binaries are distributed as GitHub Releases. When you push a version tag, it kicks off an action that creates a new GitHub release for that tag, builds release binaries and attaches them to the release. -1. Once ready to merge, tag the commit by running either `git tag -a v#.#.# -m #.#.#` (release), or `git tag -a v#.#.#-rc.# -m #.#.#` (release candidate) +1. After pulling `master` in the step above, tag the commit by running either `git tag -a v#.#.# -m #.#.#` (release), or `git tag -a v#.#.#-rc.# -m #.#.#` (release candidate) 1. Run `git push --tags`. 1. Wait for CI to pass. +1. If CI fails, delete the tag locally and remotely +1. Fix whatever caused the CI failure +1. Re-tag the healthy commit, and wait for CI to pass again. ### Edit the release @@ -74,11 +81,6 @@ After CI builds the release binaries and they appear on the [releases page](http The new release candidate should then include updated testing instructions with a small changelog at the top to get folks who installed the old release candidate up to speed. -## Publish - -1. Hit the big green Merge button on the release PR. -1. `git checkout master` and `git pull --rebase origin master` - ### Publish to crates.io (full release only) **IMPORTANT: This step is the hardest to fix if you mess it up. Do not run this step for Release Candidates**. diff --git a/npm/binary.js b/npm/binary.js index 742bd3ef8..f5f634ff8 100644 --- a/npm/binary.js +++ b/npm/binary.js @@ -38,7 +38,7 @@ const getBinary = () => { const customPath = process.env.WRANGLER_INSTALL_PATH || process.env.npm_config_wrangler_install_path; - const installDirectory = join(customPath || __dirname, "wrangler"); + const installDirectory = join(customPath || os.homedir(), ".wrangler"); return new Binary(url, { name: "wrangler", installDirectory }); }; diff --git a/npm/npm-shrinkwrap.json b/npm/npm-shrinkwrap.json index c1cbdafb8..c912d1bd3 100644 --- a/npm/npm-shrinkwrap.json +++ b/npm/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "@cloudflare/wrangler", - "version": "1.14.0", + "version": "1.14.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@cloudflare/wrangler", - "version": "1.14.0", + "version": "1.14.1", "hasInstallScript": true, "license": "MIT OR Apache-2.0", "dependencies": { diff --git a/npm/package.json b/npm/package.json index 52f8936d7..f424d8eff 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@cloudflare/wrangler", - "version": "1.14.0", + "version": "1.14.1", "description": "Command-line interface for all things Cloudflare Workers", "main": "binary.js", "scripts": {