Skip to content

Commit a68f81c

Browse files
committed
fix(release): fix workflow, version asset names, update changelog
- Switch taiki-e/install-action from @cargo-deny/@cargo-about to @v2 with explicit tool: param (fixes unresolvable git ref) - Fix about.hbs template to iterate licenses instead of broken overview.used_by - Add scripts/generate-licenses.sh for license generation - Include version number in release asset filenames - Update install.sh to match versioned asset names - Add CHANGELOG.md entry for 0.4.1
1 parent 9f0799c commit a68f81c

File tree

5 files changed

+37
-12
lines changed

5 files changed

+37
-12
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ jobs:
3535
${{ runner.os }}-cargo-
3636
3737
- name: Install cargo-deny
38-
uses: taiki-e/install-action@cargo-deny
38+
uses: taiki-e/install-action@v2
39+
with:
40+
tool: cargo-deny
3941

4042
- name: Check and unit tests
4143
run: ./scripts/check.sh
@@ -166,22 +168,26 @@ jobs:
166168

167169
- name: Prepare release assets
168170
run: |
171+
version="${GITHUB_REF_NAME#v}"
169172
mkdir release-assets
170173
for dir in artifacts/exapump-*/; do
171174
name="$(basename "$dir")"
175+
versioned="${name/exapump-/exapump-${version}-}"
172176
if [ "$name" = "exapump-windows-x86_64" ]; then
173-
cp "$dir/exapump.exe" "release-assets/${name}.exe"
177+
cp "$dir/exapump.exe" "release-assets/${versioned}.exe"
174178
else
175-
cp "$dir/exapump" "release-assets/${name}"
176-
chmod +x "release-assets/${name}"
179+
cp "$dir/exapump" "release-assets/${versioned}"
180+
chmod +x "release-assets/${versioned}"
177181
fi
178182
done
179183
180184
- name: Install cargo-about
181-
uses: taiki-e/install-action@cargo-about
185+
uses: taiki-e/install-action@v2
186+
with:
187+
tool: cargo-about
182188

183189
- name: Generate third-party licenses
184-
run: cargo about generate about.hbs > release-assets/third-party-licenses.txt
190+
run: ./scripts/generate-licenses.sh > release-assets/third-party-licenses.txt
185191

186192
- name: Create GitHub release
187193
uses: softprops/action-gh-release@v2

CHANGELOG.md

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

3+
## 0.4.1
4+
5+
- Bump exarrow-rs to 0.6.1 (fix hanging on missing schema)
6+
- Fix health check to use `query` instead of `execute_update`
7+
- Fix CI container startup timing and wait diagnostics
8+
39
## 0.4.0
410

511
- Interactive SQL REPL with readline history and table/CSV/JSON output

about.hbs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
{{#each overview.used_by}}
2-
## {{name}} v{{version}}
3-
License: {{#each licenses}}{{id}}{{#unless @last}}, {{/unless}}{{/each}}
4-
{{#if authors}}Authors: {{authors}}{{/if}}
1+
{{#each licenses}}
2+
## {{name}} ({{id}})
53

6-
{{#each licenses}}{{#if text}}{{{text}}}{{/if}}
4+
Used by:
5+
{{#each used_by}}
6+
- {{crate.name}} v{{crate.version}}
77
{{/each}}
8+
9+
{{{text}}}
10+
811
---
912
{{/each}}

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ main() {
5555
exit 1
5656
fi
5757

58-
asset="exapump-${os}-${arch}"
58+
asset="exapump-${version}-${os}-${arch}"
5959
url="https://github.com/${REPO}/releases/download/v${version}/${asset}"
6060

6161
printf "Installing exapump v%s (%s/%s)...\n" "$version" "$os" "$arch"

scripts/generate-licenses.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
if ! command -v cargo-about &>/dev/null; then
5+
echo "ERROR: cargo-about not installed" >&2
6+
echo " Install with: cargo install cargo-about" >&2
7+
exit 1
8+
fi
9+
10+
cargo about generate about.hbs

0 commit comments

Comments
 (0)