Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(pkg): AUR package is changed to reflect packaging guidelines #278

Merged
merged 4 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/aur-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,19 @@ jobs:
release-aur:
name: release aur
runs-on: ubuntu-latest
container:
image: archlinux/archlinux:base-devel
if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
steps:
- name: Update and install packages
run: |
sudo pacman -Syu --noconfirm --noprogressbar
sudo pacman -S --noconfirm --noprogressbar curl

- name: Get PKGBUILD and .SRCINFO
id: get_pkgbuild
run: |
curl -o PKGBUILD https://raw.githubusercontent.com/animo/siera-cli/main/pkg/PKGBUILD
curl -o .SRCINFO https://raw.githubusercontent.com/animo/siera-cli/main/pkg/.SRCINFO
- name: Gather data and rewrite PKGBUILD file
id: gather_data_and_rewrite
run: |
Expand All @@ -26,8 +32,10 @@ jobs:
VERSION=${VERSION:1}
# replace package version in PKGBUILD
sed -i '3s|.*|pkgver\='"$VERSION"'|' PKGBUILD
# replace package version in .SRCINFO
sed -i '3s|.*| pkgver = '$VERSION'|' .SRCINFO
# update package sums
updpkgsums
# generate .SRCINFO
makepkg --printsrcinfo > .SRCINFO
- name: commit to AUR
id: commit_aur
env:
Expand Down
9 changes: 0 additions & 9 deletions pkg/.SRCINFO

This file was deleted.

40 changes: 30 additions & 10 deletions pkg/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,17 +1,37 @@
# Mainainer: Animo Solutions [email protected]
# Maintainer: Animo Solutions [email protected]
# Contributor: iamawacko <[email protected]>
pkgname="siera"
pkgver="0.0.0"
pkgrel="1"
pkgver=0.0.0
pkgrel="2"
pkgdesc="A CLI tool for Hyperledger Aries written in Rust"
arch=(x86_64)
arch=(any)
license=('MIT')
depends=()
source=("https://github.com/animo/siera-cli/archive/refs/tags/v$pkgver.tar.gz")
depends=('cargo')
provides=('siera')
md5sums=()
sha256sums=()

prepare() {
cd "siera-cli-$pkgver"
case $CARCH in
"pentium4")
cargo fetch --locked --target "i686-unknown-linux-gnu"
Comment on lines +16 to +17
Copy link
Member

@berendsliedrecht berendsliedrecht Feb 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the proper check for this? Shouldn't we use arch?

Copy link
Contributor Author

@iamwacko iamwacko Feb 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

technically yeah, but with archlinux32 the $CARCH isn't usually i686, so it wouldn't properly compile. I have a few computers running archlinux32, so it's a habit I've picked up.

It doesn't matter too much, I doubt anyone's going to run siera-cli on their 17 year old computer, so you could remove it if you want.

;;
*)
cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
;;
esac
}

build() {
cd "siera-cli-$pkgver"
export RUSTUP_TOOLCHAIN=stable
export CARGO_TARGET_DIR=target
cargo build --frozen --release
}

package() {
sudo mkdir -p /usr/share/licenses/${pkgname}
sudo curl -L -o /usr/share/licenses/${pkgname}/LICENSE https://raw.githubusercontent.com/animo/siera/main/LICENSE
sudo curl -L -o /usr/bin/${pkgname} https://github.com/animo/${pkgname}/releases/download/v${pkgver}/linux-x86_64-siera
sudo chmod +x /usr/bin/${pkgname}
cd "siera-cli-$pkgver"
install -Dm755 "target/release/$pkgname" -t "$pkgdir/usr/bin"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
Loading