Skip to content

Commit fddf5d9

Browse files
committed
Remove gpg hacks
1 parent 167d91e commit fddf5d9

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

.github/workflows/cd.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,23 +127,18 @@ jobs:
127127
- run: tar cJf $FILENAME pkgx
128128

129129
- name: GPG sign archive
130-
# NOTE the +sqlite3 is a bug that we can’t figure out that only fails
131-
# on darwin aarch64 in CI, the sqlite dep is not installed for some
132-
# reason. Works locally! So we're confused and stuck.
133130
run: |
134131
./pkgx gpg-agent --daemon || true
135132
echo $GPG_PRIVATE_KEY | \
136133
base64 -d | \
137-
./pkgx +sqlite3 gpg --import --batch --yes
134+
./pkgx gpg --import --batch --yes
138135
./pkgx gpg \
139136
--detach-sign --armor \
140137
--local-user $GPG_KEY_ID \
141138
$FILENAME
142139
env:
143140
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
144141
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
145-
if: matrix.platform.build-id != 'linux+x86-64'
146-
# ^^ pkgx^2 deployment woe
147142

148143
- run: echo 'naughty-boy' > $FILENAME.asc
149144
if: matrix.platform.build-id == 'linux+x86-64'

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "pkgx"
33
description = "Run anything"
44
authors = ["Max Howell <[email protected]>", "Jacob Heider <[email protected]>"]
55
license = "Apache-2.0"
6-
version = "2.1.0"
6+
version = "2.1.1"
77
edition = "2021"
88
repository = "https://github.com/pkgxdev/pkgx"
99

@@ -14,7 +14,7 @@ regex = "1.11.1"
1414
indicatif = "0.17.9"
1515
nix = { version = "0.29.0", features = ["process"] }
1616
serde_json = "1.0.135"
17-
libpkgx = { version = "0.1.0", path = "../lib" }
17+
libpkgx = { version = "0.1.1", path = "../lib" }
1818
console = { version = "0.15", default-features = false, features = [
1919
"ansi-parsing",
2020
] }

crates/lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libpkgx"
33
description = "Install and run `pkgx` packages"
44
authors = ["Max Howell <[email protected]>", "Jacob Heider <[email protected]>"]
55
license = "Apache-2.0"
6-
version = "0.1.0"
6+
version = "0.1.1"
77
edition = "2021"
88
repository = "https://github.com/pkgxdev/pkgx"
99

scripts/publish-release.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ if [ "$(git rev-parse --abbrev-ref HEAD)" != main ]; then
1111
fi
1212

1313
v_new=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "pkgx") | .version')
14+
v_latest=$(gh release view --json tagName --jq .tagName)
1415

15-
case $(gh release view --json isDraft | jq .isDraft) in
16-
'release not found')
16+
case "$((gh release view v$v_new --json isDraft | jq .isDraft) 2>&1)" in
17+
release\ not\ found)
1718
gum confirm "prepare draft release for $v_new?" || exit 1
1819
1920
gh release create \
2021
v$v_new \
2122
--draft=true \
22-
--prerelease=$is_prerelease \
2323
--generate-notes \
24-
--notes-start-tag=v$v_latest \
24+
--notes-start-tag=$v_latest \
2525
--title=v$v_new
2626
2727
;;
@@ -32,6 +32,9 @@ true)
3232
false)
3333
gum format "$v_new already published! edit \`./crates/cli/Cargo.toml\`"
3434
exit 1;;
35+
*)
36+
echo 'unexpected exit result' >&2
37+
exit 2;;
3538
esac
3639
3740
git push origin main

0 commit comments

Comments
 (0)