logos-messaging/logos-delivery
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-delivery.git synced 2026-06-16 19:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: derive librln version from Makefile, drop cargo cache

Browse Source 
The librln cache key/path hardcoded v0.9.0, so after the zerokit v2.0.2
bump it never matched the built artifact and librln was rebuilt every run.
Derive the version via `make print-librln-version` so it tracks the
Makefile automatically.

Drop the cargo/zerokit-target cache: zerokit is bumped rarely, so the
librln artifact cache covers the common case, and caching the target dir
inside the submodule broke `git submodule update --init` (non-empty dir).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Igor Sirotin 2026-05-21 16:01:39 +01:00
parent f36f84b4c0
commit 7b25ae9781
No known key found for this signature in database
GPG Key ID: 0EABBCB40CB9AD4A
2 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.github/workflows/ci.yml vendored
View File

@ -72,25 +72,16 @@ jobs:
id: zerokit-sha
run: echo "sha=$(git submodule status vendor/zerokit | awk '{print $1}' | sed 's/^[+-]//')" >> $GITHUB_OUTPUT
- name: Get librln version
id: librln-version
run: echo "version=$(make print-librln-version)" >> $GITHUB_OUTPUT
- name: Cache librln
id: cache-librln
uses: actions/cache@v3
with:
path: librln_v0.9.0.a
key: ${{ runner.os }}-librln-v0.9.0-${{ steps.zerokit-sha.outputs.sha }}
- name: Cache cargo
if: steps.cache-librln.outputs.cache-hit != 'true'
uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
vendor/zerokit/target/
key: ${{ runner.os }}-cargo-zerokit-${{ steps.zerokit-sha.outputs.sha }}
restore-keys: |
${{ runner.os }}-cargo-zerokit-
path: librln_${{ steps.librln-version.outputs.version }}.a
key: ${{ runner.os }}-librln-${{ steps.librln-version.outputs.version }}-${{ steps.zerokit-sha.outputs.sha }}
- name: Install Nim ${{ env.NIM_VERSION }}
uses: jiro4989/setup-nim-action@v2
@ -154,25 +145,16 @@ jobs:
id: zerokit-sha
run: echo "sha=$(git submodule status vendor/zerokit | awk '{print $1}' | sed 's/^[+-]//')" >> $GITHUB_OUTPUT
- name: Get librln version
id: librln-version
run: echo "version=$(make print-librln-version)" >> $GITHUB_OUTPUT
- name: Cache librln
id: cache-librln
uses: actions/cache@v3
with:
path: librln_v0.9.0.a
key: ${{ runner.os }}-librln-v0.9.0-${{ steps.zerokit-sha.outputs.sha }}
- name: Cache cargo
if: steps.cache-librln.outputs.cache-hit != 'true'
uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
vendor/zerokit/target/
key: ${{ runner.os }}-cargo-zerokit-${{ steps.zerokit-sha.outputs.sha }}
restore-keys: |
${{ runner.os }}-cargo-zerokit-
path: librln_${{ steps.librln-version.outputs.version }}.a
key: ${{ runner.os }}-librln-${{ steps.librln-version.outputs.version }}-${{ steps.zerokit-sha.outputs.sha }}
- name: Install Nim ${{ env.NIM_VERSION }}
uses: jiro4989/setup-nim-action@v2

5
Makefile
View File

@ -173,11 +173,14 @@ deps: | nimble
##################
## RLN ##
##################
.PHONY: librln
.PHONY: librln print-librln-version
LIBRLN_BUILDDIR := $(CURDIR)/vendor/zerokit
LIBRLN_VERSION := v0.9.0
print-librln-version:
@echo "$(LIBRLN_VERSION)"
ifeq ($(detected_OS),Windows)
LIBRLN_FILE ?= rln.lib
else