diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 2b8fef3..8899a10 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -139,37 +139,37 @@ jobs: run: | VERSION="${{ steps.version.outputs.VERSION }}" sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml - sed -i "s/^Version:.*/Version: ${VERSION}/" neuron.spec + sed -i "s/^Version:.*/Version: ${VERSION}/" helexa-neuron.spec - name: Generate changelog entry uses: https://git.lair.cafe/actions/rpm-changelog@v1 with: - spec: neuron.spec + spec: helexa-neuron.spec version: ${{ steps.version.outputs.VERSION }} - name: Generate source tarball run: | set -ex VERSION="${{ steps.version.outputs.VERSION }}" - tar czf /tmp/neuron-${VERSION}.tar.gz \ - --transform "s,^\.,neuron-${VERSION}," \ + tar czf /tmp/helexa-neuron-${VERSION}.tar.gz \ + --transform "s,^\.,helexa-neuron-${VERSION}," \ --exclude='./target' \ --exclude='./.git' \ --exclude='*.tar.gz' \ --exclude='*.src.rpm' \ . - mv /tmp/neuron-${VERSION}.tar.gz . + mv /tmp/helexa-neuron-${VERSION}.tar.gz . - name: Vendor Rust dependencies run: | VERSION="${{ steps.version.outputs.VERSION }}" cargo vendor vendor/ - tar czf neuron-${VERSION}-vendor.tar.gz vendor/ + tar czf helexa-neuron-${VERSION}-vendor.tar.gz vendor/ rm -rf vendor/ - name: Build SRPM run: | - rpmbuild -bs neuron.spec \ + rpmbuild -bs helexa-neuron.spec \ --define "_sourcedir $(pwd)" \ --define "_srcrpmdir $(pwd)" @@ -209,7 +209,7 @@ jobs: - name: Publish to COPR uses: https://git.lair.cafe/actions/copr-publish@v1 with: - project: helexa/neuron + project: helexa/helexa-neuron srpm: "*.src.rpm" copr-config: ${{ secrets.COPR_CONFIG }} @@ -231,7 +231,7 @@ jobs: VERSION="${{ steps.version.outputs.VERSION }}" sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml sed -i "s/^Version:.*/Version: ${VERSION}/" cortex.spec - sed -i "s/^Version:.*/Version: ${VERSION}/" neuron.spec + sed -i "s/^Version:.*/Version: ${VERSION}/" helexa-neuron.spec cargo check --workspace 2>/dev/null || true - name: Generate cortex changelog entry @@ -240,10 +240,10 @@ jobs: spec: cortex.spec version: ${{ steps.version.outputs.VERSION }} - - name: Generate neuron changelog entry + - name: Generate helexa-neuron changelog entry uses: https://git.lair.cafe/actions/rpm-changelog@v1 with: - spec: neuron.spec + spec: helexa-neuron.spec version: ${{ steps.version.outputs.VERSION }} - name: Commit and push @@ -253,7 +253,7 @@ jobs: VERSION="${{ steps.version.outputs.VERSION }}" git config user.name "Gitea Actions" git config user.email "actions@git.lair.cafe" - git add Cargo.toml Cargo.lock cortex.spec neuron.spec + git add Cargo.toml Cargo.lock cortex.spec helexa-neuron.spec if git diff --cached --quiet; then echo "Nothing to commit for ${VERSION}" else diff --git a/CLAUDE.md b/CLAUDE.md index 5fad1a8..20f56c3 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -596,15 +596,18 @@ Completed. Both packages have RPM specs, systemd units, and example configs. CI builds parallel SRPMs on tag push and publishes to separate COPR repos. - `cortex.spec` → `helexa/cortex` COPR: binary, systemd unit, config files -- `neuron.spec` → `helexa/neuron` COPR: binary, systemd unit, config +- `helexa-neuron.spec` → `helexa/helexa-neuron` COPR: binary, systemd unit, + config. Package renamed from `neuron` to avoid collision with Fedora's + NEURON neural-simulation package (https://src.fedoraproject.org/rpms/neuron); + binary, systemd unit, system user, and config dir stay as `neuron`. - `data/cortex.service`, `data/neuron.service` — systemd units - `cortex.example.toml`, `neuron.example.toml`, `models.example.toml` - CI: parallel `srpm-cortex` + `srpm-neuron` jobs, then parallel COPR publish Install: ```sh -dnf copr enable helexa/cortex && dnf install cortex # gateway host -dnf copr enable helexa/neuron && dnf install neuron # GPU nodes +dnf copr enable helexa/cortex && dnf install cortex # gateway host +dnf copr enable helexa/helexa-neuron && dnf install helexa-neuron # GPU nodes ``` ### Phase 11: llama.cpp harness stub diff --git a/neuron.spec b/helexa-neuron.spec similarity index 91% rename from neuron.spec rename to helexa-neuron.spec index 7c0e4cc..0731929 100644 --- a/neuron.spec +++ b/helexa-neuron.spec @@ -1,7 +1,10 @@ -Name: neuron +Name: helexa-neuron Version: 0.1.12 Release: 1%{?dist} Summary: Per-node GPU discovery and harness management daemon for cortex +# Package name disambiguates from Fedora's existing "neuron" package +# (NEURON neural simulation environment from Yale). Binary, systemd +# unit, and system user are still called "neuron" for brevity. License: GPL-3.0-or-later URL: https://git.lair.cafe/helexa/cortex