From 3cddea19c3a5daaa249629f9e3dbefd1808fe6d5 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 12 Aug 2023 15:47:05 +0200 Subject: [PATCH 1/3] chore: revert to old platform syntax --- .woodpecker/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 768e2c8..357ab76 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -3,8 +3,7 @@ matrix: - 'amd64' - 'arm64' -labels: - platform: "linux/${ARCH}" +platform: "linux/${ARCH}" when: branch: From d3cb29b52eaef2777b617246dd41a57f9041246c Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sun, 13 Aug 2023 10:17:21 +0200 Subject: [PATCH 2/3] chore: move PKGBUILD to separate repo --- CHANGELOG.md | 7 +++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- PKGBUILD | 42 ------------------------------------------ README.md | 14 ++++++++++++++ 5 files changed, 23 insertions(+), 44 deletions(-) delete mode 100644 PKGBUILD diff --git a/CHANGELOG.md b/CHANGELOG.md index 44603b6..5305b42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://git.rustybever.be/Chewing_Bever/alex/src/branch/dev) +## [0.4.1](https://git.rustybever.be/Chewing_Bever/alex/src/tag/0.4.1) + +### Changed + +* Moved PKGBUILD to separate repo +* Properly update lock file + ## [0.4.0](https://git.rustybever.be/Chewing_Bever/alex/src/tag/0.4.0) ### Added diff --git a/Cargo.lock b/Cargo.lock index e03b1d5..788d506 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,7 +10,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "alex" -version = "0.3.1" +version = "0.4.1" dependencies = [ "chrono", "clap", diff --git a/Cargo.toml b/Cargo.toml index f37c2ca..9e625f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alex" -version = "0.4.0" +version = "0.4.1" description = "Wrapper around Minecraft server processes, designed to complement Docker image installations." authors = ["Jef Roosens"] edition = "2021" diff --git a/PKGBUILD b/PKGBUILD deleted file mode 100644 index 6bb6b6c..0000000 --- a/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Jef Roosens - -pkgname='alex' -pkgver=0.3.1 -pkgdesc='Wrapper around Minecraft server processes, designed to complement Docker image installations.' -pkgrel=1 -arch=('x86_64' 'aarch64') - -url='https://git.rustybever.be/Chewing_Bever/alex' -license=('MIT') - -makedepends=('cargo') -depends=('glibc' 'gcc-libs' ) - -source=("${pkgname}-${pkgver}.tar.gz::https://git.rustybever.be/Chewing_Bever/alex/archive/${pkgver}.tar.gz") -sha512sums=('f88903bd99397f3e9a1c4a40febc65eace0d594cde8de20d54ed1cd0597512152111e7a20acaaa971309d5afe1ea267c7ef3b08f0d803237e8004808a83752c5') - -prepare() { - cd "${pkgname}" - - export RUSTUP_TOOLCHAIN=stable - cargo fetch --locked --target "$CARCH-unknown-linux-gnu" -} - -build() { - cd "${pkgname}" - - export RUSTUP_TOOLCHAIN=stable - export CARGO_TARGET_DIR=target - cargo build --frozen --release --all-features -} - -check() { - cd "${pkgname}" - - export RUSTUP_TOOLCHAIN=stable - cargo test --frozen --all-features -} - -package() { - install -Dm0755 -t "${pkgdir}/usr/bin/" "${pkgname}/target/release/${pkgname}" -} diff --git a/README.md b/README.md index dc96623..979bd1e 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,20 @@ Alex is distributed as statically compiled binaries for Linux amd64 and arm64. These can be found [here](https://git.rustybever.be/Chewing_Bever/alex/packages). +### Arch + +Arch users can install prebuilt `x86_64` & `aarch64` packages from my `bur` +repository. Add the following at the bottom of your `pacman.conf`: + +```toml +[bur] +Server = https://arch.r8r.be/$repo/$arch +SigLevel = Optional +``` + +If you prefer building the package yourself, the PKGBUILD can be found +[here](https://git.rustybever.be/bur/alex-mc). + ### Dockerfiles You can easily install alex in your Docker images by letting Docker download it From d23227dd0bf067ab2f0c30bb4cec378fdca18497 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sun, 13 Aug 2023 10:18:53 +0200 Subject: [PATCH 3/3] fix(ci): use old platform --- .woodpecker/arch-release.yml | 37 ------------------------------------ .woodpecker/clippy.yml | 3 +-- .woodpecker/lint.yml | 3 +-- .woodpecker/release.yml | 3 +-- 4 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 .woodpecker/arch-release.yml diff --git a/.woodpecker/arch-release.yml b/.woodpecker/arch-release.yml deleted file mode 100644 index 1bd073f..0000000 --- a/.woodpecker/arch-release.yml +++ /dev/null @@ -1,37 +0,0 @@ -matrix: - PLATFORM: - - 'linux/amd64' - # - linux/arm64 - -labels: - platform: ${PLATFORM} - -when: - event: tag - -skip_clone: true - -steps: - build: - image: 'menci/archlinuxarm:base-devel' - pull: true - commands: - - echo -e '[bur]\nServer = https://arch.r8r.be/$repo/$arch\nSigLevel = Optional' >> /etc/pacman.conf - # Update packages - - pacman -Syu --noconfirm - # Create non-root user to perform build & switch to their home - - groupadd -g 1000 builder - - useradd -mg builder builder - - chown -R builder:builder "$PWD" - - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - - su builder - - curl -OL "https://git.rustybever.be/Chewing_Bever/alex/raw/tag/$CI_COMMIT_TAG/PKGBUILD" - - makepkg -s --noconfirm --needed - - publish: - image: 'curlimages/curl' - commands: - # Publish the package - - 'for pkg in $(ls -1 *.pkg*); do curl -XPOST -T "$pkg" -H "X-API-KEY: $VIETER_API_KEY" https://arch.r8r.be/bur/publish; done' - secrets: - - vieter_api_key diff --git a/.woodpecker/clippy.yml b/.woodpecker/clippy.yml index 5f23363..7bdc59c 100644 --- a/.woodpecker/clippy.yml +++ b/.woodpecker/clippy.yml @@ -1,5 +1,4 @@ -labels: - platform: 'linux/amd64' +platform: 'linux/amd64' when: branch: diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml index 15e45dc..be6f331 100644 --- a/.woodpecker/lint.yml +++ b/.woodpecker/lint.yml @@ -1,5 +1,4 @@ -labels: - platform: 'linux/amd64' +platform: 'linux/amd64' when: branch: diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml index 892dced..32524de 100644 --- a/.woodpecker/release.yml +++ b/.woodpecker/release.yml @@ -3,8 +3,7 @@ matrix: - 'linux/amd64' - 'linux/arm64' -labels: - platform: ${PLATFORM} +platform: ${PLATFORM} when: event: tag