Skip to content

Commit 43788ca

Browse files
committed
Fix bin/package
Also, To more easily test the `bin/package` script, build and publish packages for all tags, not just those that start with `v`. type: fixed
1 parent f217ac6 commit 43788ca

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- master
77
tags:
8-
- v*.*.*
8+
- '*'
99
pull_request:
1010
branches:
1111
- master
@@ -135,13 +135,13 @@ jobs:
135135

136136
- name: Package
137137
id: package
138-
if: startsWith(github.ref, 'refs/tags/v')
138+
if: startsWith(github.ref, 'refs/tags/')
139139
shell: bash
140140
run: ./bin/package ${{github.ref}} ${{matrix.os}} ${{matrix.target}}
141141

142142
- name: Publish
143143
uses: softprops/action-gh-release@v1
144-
if: startsWith(github.ref, 'refs/tags/v')
144+
if: startsWith(github.ref, 'refs/tags/')
145145
with:
146146
draft: false
147147
files: ${{steps.package.outputs.archive}}

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ Changelog
22
=========
33

44

5+
UNRELEASED - 2020-04-23
6+
-----------------------
7+
- :bug: [`xxxxxxxxxxxx`](https://github.com/casey/intermodal/commits/master) Fix `bin/package` - _Casey Rodarmor <casey@rodarmor.com>_
8+
9+
510
[v0.1.7](https://github.com/casey/intermodal/releases/tag/v0.1.7) - 2020-04-22
611
------------------------------------------------------------------------------
7-
- :bookmark: [`xxxxxxxxxxxx`](https://github.com/casey/intermodal/commits/master) Release v0.1.7 - _Casey Rodarmor <casey@rodarmor.com>_
12+
- :bookmark: [`f217ac659a14`](https://github.com/casey/intermodal/commit/f217ac659a145f4385b68f20a86b610a02f679f5) Release v0.1.7 - _Casey Rodarmor <casey@rodarmor.com>_
813
- :zap: [`25ac072985f8`](https://github.com/casey/intermodal/commit/25ac072985f8799474298e6922043746888c0c06) Allow positional input to `imdl torrent show` - Fixes [#375](https://github.com/casey/intermodal/issues/375) - _Casey Rodarmor <casey@rodarmor.com>_
914
- :bug: [`cecd2f66a5d6`](https://github.com/casey/intermodal/commit/cecd2f66a5d6a6b44f27f8ca499e359d82d29ab7) Fix help strings - _Casey Rodarmor <casey@rodarmor.com>_
1015
- :zap: [`ebec2d591a7a`](https://github.com/casey/intermodal/commit/ebec2d591a7a0e2a2c4cd55217db4ba46b5dd9ed) Allow positional shell to `imdl completions` - Fixes [#375](https://github.com/casey/intermodal/issues/375) - _Casey Rodarmor <casey@rodarmor.com>_

bin/gen/src/command_ext.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ pub(crate) trait CommandExt {
88
impl CommandExt for Command {
99
#[throws]
1010
fn out(&mut self) -> String {
11+
info!("Running {:?}…", self);
12+
1113
let output = self
1214
.stdout(Stdio::piped())
1315
.stderr(Stdio::inherit())

bin/package

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ echo "Building $bin..."
1717

1818
case $os in
1919
ubuntu-latest)
20-
sudo apt-get help2man install musl-tools
20+
sudo apt install help2man musl-tools
2121
;;
2222
macos-latest)
2323
brew install help2man
2424
;;
2525
windows-latest)
26-
choco install gnuwin
2726
;;
2827
esac
2928

@@ -43,11 +42,6 @@ rm -rf completions
4342
mkdir completions
4443
$executable completions --dir completions
4544

46-
echo "Building man pages..."
47-
rm -rf man
48-
mkdir man
49-
cargo run --package gen man
50-
5145
echo "Copying release files..."
5246
mkdir dist
5347
cp -r \
@@ -59,9 +53,16 @@ cp -r \
5953
LICENSE \
6054
README.md \
6155
completions \
62-
man \
6356
$dist
6457

58+
if [[ $os != windows-latest ]]; then
59+
echo "Building man pages..."
60+
rm -rf man
61+
mkdir man
62+
cargo run --package gen man
63+
cp -r man $dist/man
64+
fi
65+
6566
cd $dist
6667
echo "Creating release archive..."
6768
case $os in

0 commit comments

Comments
 (0)