Skip to content

Commit 3c4ac40

Browse files
aur + ci fixes for the optionSDK path dependency
- packaging/aur: fetch the optionSDK v0.1.6 tarball and link it as ../optionSDK (same layout as opsh) — opt 0.1.4 cannot build from the optioncli tarball alone; bump.sh now hashes the SDK tarball too. Already published to AUR as opt 0.1.4-1. - ci.yml: check out fireflylabss/optionSDK (v0.1.6) next to the repo so the ../optionSDK path dep resolves Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
1 parent 0a3ad32 commit 3c4ac40

4 files changed

Lines changed: 29 additions & 3 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,19 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
16+
with:
17+
path: optioncli
18+
- uses: actions/checkout@v4
19+
with:
20+
repository: fireflylabss/optionSDK
21+
path: optionSDK
22+
ref: v0.1.6
1623
- uses: dtolnay/rust-toolchain@stable
1724
with:
1825
components: rustfmt
1926
- run: cargo fmt --all --check
27+
working-directory: optioncli
2028
- run: cargo test --all-targets
29+
working-directory: optioncli
2130
- run: cargo build --release
31+
working-directory: optioncli

‎packaging/aur/.SRCINFO‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ pkgbase = opt
1010
depends = glibc
1111
options = !lto
1212
source = optioncli-0.1.4.tar.gz::https://github.com/fireflylabss/optioncli/archive/refs/tags/v0.1.4.tar.gz
13+
source = optionSDK-0.1.6.tar.gz::https://github.com/fireflylabss/optionSDK/archive/refs/tags/v0.1.6.tar.gz
1314
sha256sums = 11434c3345a7df0e5aab3c4a4d3d8db24fcf9925302edaab02a27ff57963ee8c
15+
sha256sums = 0b1ca7a784519f1a61656fd154eb731b27b245d41bac5de5e6dd51539dd4bdc7
1416

1517
pkgname = opt

‎packaging/aur/PKGBUILD‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@
22
pkgname=opt
33
pkgver=0.1.4
44
pkgrel=1
5+
_sdkver=0.1.6
56
pkgdesc='Option family CLI: dispatch, doctor, install and system utilities'
67
arch=('x86_64')
78
url='https://github.com/fireflylabss/optioncli'
89
license=('Apache-2.0')
910
depends=('gcc-libs' 'glibc')
1011
makedepends=('cargo')
1112
options=('!lto')
12-
source=("optioncli-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
13-
sha256sums=('11434c3345a7df0e5aab3c4a4d3d8db24fcf9925302edaab02a27ff57963ee8c')
13+
source=("optioncli-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz"
14+
"optionSDK-$_sdkver.tar.gz::https://github.com/fireflylabss/optionSDK/archive/refs/tags/v$_sdkver.tar.gz")
15+
sha256sums=('11434c3345a7df0e5aab3c4a4d3d8db24fcf9925302edaab02a27ff57963ee8c'
16+
'0b1ca7a784519f1a61656fd154eb731b27b245d41bac5de5e6dd51539dd4bdc7')
1417

1518
prepare() {
19+
# Cargo.toml depends on optionSDK via path "../optionSDK".
20+
ln -sfn "optionSDK-$_sdkver" optionSDK
1621
cd "optioncli-$pkgver"
1722
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
1823
}

‎packaging/aur/bump.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,16 @@ done
1616

1717
echo "==> hashing tarball"
1818
SHA="$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}')"
19+
20+
SDK_VER="$(sed -n 's/^_sdkver=//p' "$PKGBUILD")"
21+
SDK_URL="https://github.com/fireflylabss/optionSDK/archive/refs/tags/v${SDK_VER}.tar.gz"
22+
echo "==> hashing optionSDK ${SDK_VER} tarball"
23+
SDK_SHA="$(curl -fsSL "$SDK_URL" | sha256sum | awk '{print $1}')"
24+
1925
sed -i "s/^pkgver=.*/pkgver=${VER}/" "$PKGBUILD"
2026
sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
21-
sed -i "s/^sha256sums=.*/sha256sums=('${SHA}')/" "$PKGBUILD"
27+
sed -i "s/^sha256sums=('[0-9a-f]*'/sha256sums=('${SHA}'/" "$PKGBUILD"
28+
sed -i "/^sha256sums=/{n;s/'[0-9a-f]*'/'${SDK_SHA}'/}" "$PKGBUILD"
2229

2330
cat > "$SRCINFO" <<EOF
2431
pkgbase = opt
@@ -33,7 +40,9 @@ pkgbase = opt
3340
depends = glibc
3441
options = !lto
3542
source = optioncli-${VER}.tar.gz::https://github.com/fireflylabss/optioncli/archive/refs/tags/v${VER}.tar.gz
43+
source = optionSDK-${SDK_VER}.tar.gz::${SDK_URL}
3644
sha256sums = ${SHA}
45+
sha256sums = ${SDK_SHA}
3746
3847
pkgname = opt
3948
EOF

0 commit comments

Comments
 (0)