Skip to content

Commit 81e354b

Browse files
authored
Merge pull request #10943 from ipfs/merge-release-v0.37.0
Merge release v0.37.0
2 parents 82fef0c + eb4edc0 commit 81e354b

File tree

5 files changed

+266
-56
lines changed

5 files changed

+266
-56
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Kubo Changelogs
22

3+
- [v0.38](docs/changelogs/v0.38.md)
34
- [v0.37](docs/changelogs/v0.37.md)
45
- [v0.36](docs/changelogs/v0.36.md)
56
- [v0.35](docs/changelogs/v0.35.md)

bin/mkreleaselog

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ msg() {
7979

8080
statlog() {
8181
local module="$1"
82-
local rpath="$GOPATH/src/$(strip_version "$module")"
82+
local rpath
83+
if [[ "$module" == "github.com/ipfs/kubo" ]]; then
84+
rpath="$ROOT_DIR"
85+
else
86+
rpath="$GOPATH/src/$(strip_version "$module")"
87+
fi
8388
local start="${2:-}"
8489
local end="${3:-HEAD}"
8590
local mailmap_file="$rpath/.mailmap"
@@ -166,7 +171,12 @@ release_log() {
166171
local start="$2"
167172
local end="${3:-HEAD}"
168173
local repo="$(strip_version "$1")"
169-
local dir="$GOPATH/src/$repo"
174+
local dir
175+
if [[ "$module" == "github.com/ipfs/kubo" ]]; then
176+
dir="$ROOT_DIR"
177+
else
178+
dir="$GOPATH/src/$repo"
179+
fi
170180

171181
local commit pr
172182
git -C "$dir" log \
@@ -203,8 +213,13 @@ mod_deps() {
203213
ensure() {
204214
local repo="$(strip_version "$1")"
205215
local commit="$2"
206-
local rpath="$GOPATH/src/$repo"
207-
if [[ ! -d "$rpath" ]]; then
216+
local rpath
217+
if [[ "$1" == "github.com/ipfs/kubo" ]]; then
218+
rpath="$ROOT_DIR"
219+
else
220+
rpath="$GOPATH/src/$repo"
221+
fi
222+
if [[ "$1" != "github.com/ipfs/kubo" ]] && [[ ! -d "$rpath" ]]; then
208223
msg "Cloning $repo..."
209224
git clone "http://$repo" "$rpath" >&2
210225
fi
@@ -237,10 +252,7 @@ recursive_release_log() {
237252
local module="$(go list -m)"
238253
local dir="$(go list -m -f '{{.Dir}}')"
239254

240-
if [[ "${GOPATH}/${module}" -ef "${dir}" ]]; then
241-
echo "This script requires the target module and all dependencies to live in a GOPATH."
242-
return 1
243-
fi
255+
# Kubo can be run from any directory, dependencies still use GOPATH
244256

245257
(
246258
local result=0

0 commit comments

Comments
 (0)