Skip to content

Commit 1a20c80

Browse files
committed
Fix release process for Homebrew and NixOS/nixpkgs
1 parent 917438f commit 1a20c80

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

RELEASE_NOTES.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release notes
22

3+
## New in git-machete 2.15.1
4+
5+
- fixed: release process for Homebrew and NixOS/nixpkgs
6+
37
## New in git-machete 2.15.0
48

59
- added: `addable` category of `list`
@@ -14,7 +18,6 @@
1418
- improved: `discover` limited to ca. 10 most recently checked out branches by default
1519
- improved: `discover` skips merged branches for which no child branches have been inferred
1620
- improved: release process has been simplified
17-
- improved: simplify the release process
1821

1922
## New in git-machete 2.14.0
2023

ci/checks/links.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Downtime of the linked the websites shouldn't block a release or a master build.
4-
[[ $TRAVIS_TAG ]] && exit 0
3+
# Downtime of the linked websites shouldn't block a release.
54
[[ $TRAVIS_BRANCH = master ]] && exit 0
65

76
set -e -o pipefail -u

ci/homebrew-tap/travis-deploy.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ cd ../homebrew-git-machete/
77

88
git config user.email "travis@travis-ci.org"
99
git config user.name "Travis CI"
10-
[[ -n $TRAVIS_TAG ]]
11-
VERSION=${TRAVIS_TAG#v}
10+
VERSION=$(grep '__version__ = ' git_machete/__init__.py | cut -d\' -f2)
1211
sha256=$(curl -s https://pypi.org/pypi/git-machete/$VERSION/json | jq --raw-output '.urls | map(select(.packagetype == "sdist")) | .[0].digests.sha256')
1312
sed -i "s/git-machete-.*\.tar\.gz/git-machete-$VERSION.tar.gz/" git-machete.rb
1413
sed -i "s/^ sha256 .*/ sha256 \"$sha256\"/" git-machete.rb

ci/nixpkgs-pr/travis-deploy.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ DIRECTORY_HASH=$(git rev-parse HEAD:ci/nixpkgs-pr)
66
export DIRECTORY_HASH
77
cd ci/nixpkgs-pr/
88

9-
[[ -n $TRAVIS_TAG ]]
10-
VERSION=${TRAVIS_TAG#v}
9+
VERSION=$(grep '__version__ = ' git_machete/__init__.py | cut -d\' -f2)
1110
export VERSION
1211

1312
# If the image corresponding to the current state of ci/nixpkgs-pr/ is missing, build it and push to Docker Hub.

git_machete/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.15.0'
1+
__version__ = '2.15.1'

0 commit comments

Comments
 (0)