logos-messaging/logos-delivery
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-delivery.git synced 2026-04-16 21:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci and ci-nix adaptations

Browse Source
This commit is contained in:
Ivan FB 2026-04-03 03:26:19 +02:00
parent a22838b21b
commit 536502967e
No known key found for this signature in database
GPG Key ID: DF0C67A04C543270
2 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/ci-nix.yml vendored
View File

@ -16,14 +16,7 @@ jobs:
- aarch64-darwin
- x86_64-linux
nixpkg:
- libwaku
- libwaku-android-arm64
- wakucanary
exclude:
# Android SDK limitation
- system: aarch64-darwin
nixpkg: libwaku-android-arm64
- liblogosdelivery
include:
- system: aarch64-darwin
@ -36,12 +29,10 @@ jobs:
runs-on: ${{ matrix.runs_on }}
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: 'Run Nix build for {{ matrix.nixpkg }}'
- name: 'Run Nix build for ${{ matrix.nixpkg }}'
shell: bash
run: nix build -L '.?submodules=1#${{ matrix.nixpkg }}'
run: nix build -L '.#${{ matrix.nixpkg }}'
- name: 'Show result contents'
shell: bash

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

@ -30,9 +30,9 @@ jobs:
filters: |
common:
- '.github/workflows/**'
- 'vendor/**'
- 'Makefile'
- 'nimble.lock'
- 'waku.nimble'
- 'Makefile'
- 'library/**'
v2:
- 'waku/**'
@ -63,21 +63,20 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Get submodules hash
id: submodules
run: |
echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
- name: Cache submodules
- name: Cache nimble deps
id: cache-nimbledeps
uses: actions/cache@v3
with:
path: |
vendor/
.git/modules
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
path: nimbledeps/
key: ${{ runner.os }}-nimbledeps-${{ hashFiles('nimble.lock') }}
- name: Make update
run: make update
- name: Install nimble deps
if: steps.cache-nimbledeps.outputs.cache-hit != 'true'
run: |
nimble setup --localdeps
make rebuild-nat-libs-nimbledeps
make rebuild-bearssl-nimbledeps
touch nimbledeps/.nimble-setup
- name: Build binaries
run: make V=1 QUICK_AND_DIRTY_COMPILER=1 all
@ -104,21 +103,20 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Get submodules hash
id: submodules
run: |
echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
- name: Cache submodules
- name: Cache nimble deps
id: cache-nimbledeps
uses: actions/cache@v3
with:
path: |
vendor/
.git/modules
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
path: nimbledeps/
key: ${{ runner.os }}-nimbledeps-${{ hashFiles('nimble.lock') }}
- name: Make update
run: make update
- name: Install nimble deps
if: steps.cache-nimbledeps.outputs.cache-hit != 'true'
run: |
nimble setup --localdeps
make rebuild-nat-libs-nimbledeps
make rebuild-bearssl-nimbledeps
touch nimbledeps/.nimble-setup
- name: Run tests
run: |
@ -171,18 +169,20 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Get submodules hash
id: submodules
run: |
echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
- name: Cache submodules
- name: Cache nimble deps
id: cache-nimbledeps
uses: actions/cache@v3
with:
path: |
vendor/
.git/modules
key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
path: nimbledeps/
key: ${{ runner.os }}-nimbledeps-${{ hashFiles('nimble.lock') }}
- name: Install nimble deps
if: steps.cache-nimbledeps.outputs.cache-hit != 'true'
run: |
nimble setup --localdeps
make rebuild-nat-libs-nimbledeps
make rebuild-bearssl-nimbledeps
touch nimbledeps/.nimble-setup
- name: Build nph
run: |