Skip to content

Upgrade ceedling to 1.0 #206

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.

Sign up for GitHub

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

Draft
kp-mariappan-ramasamy wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Upgrade ceedling to 1.0 #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f2a6a3a
Upgrade ceedling to 1.0
kp-mariappan-ramasamy Jun 6, 2025
572708d
remove tools clang
kp-mariappan-ramasamy Jun 12, 2025
af7d906
Use particular linker
kp-mariappan-ramasamy Jun 12, 2025
7ef1d18
test android update
kp-mariappan-ramasamy Jun 12, 2025
45bd63d
Move -lm to libraries
kp-mariappan-ramasamy Jun 12, 2025
9fd30c1
remove linker in linux config
kp-mariappan-ramasamy Jun 12, 2025
01ab5d2
Adding linker manually
kp-mariappan-ramasamy Jun 12, 2025
5d4b3bd
Fix Android
kp-mariappan-ramasamy Jun 12, 2025
7034c4d
Add android arch cflags
kp-mariappan-ramasamy Jun 12, 2025
cd75c2f
Add optional deps linker
kp-mariappan-ramasamy Jun 12, 2025
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
94 changes: 47 additions & 47 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
git checkout -b "$branch" || true
- name: Run build
run: earthly --ci +all --distro=${{ matrix.distro }}
linux:
linux-x64:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand All @@ -41,15 +41,15 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Build dependencies
run: ceedling project:linux verbosity[4] clobber dependencies:make
run: ceedling --mixin=linux_x64 clobber dependencies:make --verbosity=debug
- name: Run wolfSSL Tests
run: |
cd third_party/wolfssl
cd third_party/wolfssl/source
./wolfcrypt/test/testwolfcrypt
- name: Run build and test
run: ceedling project:linux verbosity[4] test:all
run: ceedling --mixin=linux_x64 test:all --verbosity=debug
linux-multithread:
runs-on: ubuntu-22.04
steps:
Expand All @@ -59,15 +59,15 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Build dependencies
run: ceedling project:linux_multithread verbosity[4] clobber dependencies:make
run: ceedling --mixin=linux_multithread clobber dependencies:make --verbosity=debug
- name: Run wolfSSL Tests
run: |
cd third_party/wolfssl
cd third_party/wolfssl/source
./wolfcrypt/test/testwolfcrypt
- name: Run build and test
run: ceedling project:linux_multithread verbosity[4] test:all
run: ceedling --mixin=linux_multithread test:all --verbosity=debug
linux-386:
runs-on: ubuntu-22.04
steps:
Expand All @@ -77,19 +77,19 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install gcc multi lib
run: |
sudo apt update
sudo apt install -y gcc-multilib
- name: Build dependencies
run: ceedling project:linux_386 verbosity[4] clobber dependencies:make
run: ceedling --mixin=linux_386 clobber dependencies:make --verbosity=debug
- name: Run wolfSSL Tests
run: |
cd third_party/wolfssl
cd third_party/wolfssl/source
./wolfcrypt/test/testwolfcrypt
- name: Run build and test
run: ceedling project:linux_386 verbosity[4] test:all
run: ceedling --mixin=linux_386 test:all --verbosity=debug
linux-arm64:
runs-on: ubuntu-22.04
steps:
Expand All @@ -99,19 +99,19 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install ARM Tools
run: |
sudo apt update
sudo apt install -y crossbuild-essential-arm64 qemu-user
- name: Build dependencies
run: CROSS_COMPILE="aarch64-linux-gnu" CC="aarch64-linux-gnu-gcc" ceedling project:linux_arm64 verbosity[4] clobber dependencies:make
run: CROSS_COMPILE="aarch64-linux-gnu" CC="aarch64-linux-gnu-gcc" ceedling --mixin=linux_arm64 clobber dependencies:make --verbosity=debug
- name: Run wolfSSL Tests
run: |
cd third_party/wolfssl
cd third_party/wolfssl/source
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu ./wolfcrypt/test/testwolfcrypt
- name: Run build
run: CC="aarch64-linux-gnu-gcc" ceedling project:linux_arm64 verbosity[4] release
run: CC="aarch64-linux-gnu-gcc" ceedling --mixin=linux_arm64 release --verbosity=debug
linux-arm:
runs-on: ubuntu-22.04
steps:
Expand All @@ -121,19 +121,19 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install ARM Tools
run: |
sudo apt update
sudo apt install -y crossbuild-essential-armhf qemu-user
- name: Build dependencies
run: CROSS_COMPILE="arm-linux-gnueabihf" CC="arm-linux-gnueabihf-gcc" ceedling project:linux_arm verbosity[4] clobber dependencies:make
run: CROSS_COMPILE="arm-linux-gnueabihf" CC="arm-linux-gnueabihf-gcc" ceedling --mixin=linux_arm clobber dependencies:make --verbosity=debug
- name: Run wolfSSL Tests
run: |
cd third_party/wolfssl
cd third_party/wolfssl/source
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf ./wolfcrypt/test/testwolfcrypt
- name: Run build
run: CC="arm-linux-gnueabihf-gcc" ceedling project:linux_arm verbosity[4] release
run: CC="arm-linux-gnueabihf-gcc" ceedling --mixin=linux_arm release --verbosity=debug
linux-arm-no-pqc:
runs-on: ubuntu-22.04
steps:
Expand All @@ -143,19 +143,19 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install ARM Tools
run: |
sudo apt update
sudo apt install -y crossbuild-essential-armhf qemu-user
- name: Build dependencies
run: CROSS_COMPILE="arm-linux-gnueabihf" CC="arm-linux-gnueabihf-gcc" ceedling project:linux_arm_no_pqc verbosity[4] clobber dependencies:make
run: CROSS_COMPILE="arm-linux-gnueabihf" CC="arm-linux-gnueabihf-gcc" ceedling --mixin=linux_arm_no_pqc clobber dependencies:make --verbosity=debug
- name: Run wolfSSL Tests
run: |
cd third_party/wolfssl
cd third_party/wolfssl/source
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf ./wolfcrypt/test/testwolfcrypt
- name: Run build
run: CC="arm-linux-gnueabihf-gcc" ceedling project:linux_arm_no_pqc verbosity[4] release
run: CC="arm-linux-gnueabihf-gcc" ceedling --mixin=linux_arm_no_pqc release --verbosity=debug
linux-riscv64:
runs-on: ubuntu-22.04
steps:
Expand All @@ -165,20 +165,20 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install RISC-V Toolchain
run: |
sudo apt update
sudo apt install -y crossbuild-essential-riscv64 qemu-user
- name: Build dependencies
run: CROSS_COMPILE="riscv64-linux-gnu" CC="riscv64-linux-gnu-gcc" ceedling project:linux_riscv64 verbosity[4] clobber dependencies:make
run: CROSS_COMPILE="riscv64-linux-gnu" CC="riscv64-linux-gnu-gcc" ceedling --mixin=linux_riscv64 clobber dependencies:make --verbosity=debug
- name: Run wolfSSL Tests
run: |
cd third_party/wolfssl
cd third_party/wolfssl/source
QEMU_LD_PREFIX=/usr/riscv64-linux-gnu ./wolfcrypt/test/testwolfcrypt
- name: Run build
run: CC="riscv64-linux-gnu-gcc" ceedling project:linux_riscv64 verbosity[4] release
macos:
run: CC="riscv64-linux-gnu-gcc" ceedling --mixin=linux_riscv64 release --verbosity=debug
macos-x64:
runs-on: macos-13
steps:
- uses: actions/checkout@v4
Expand All @@ -187,14 +187,14 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install automake
run: HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf automake libtool
- name: Build dependencies
run: ceedling project:macos verbosity[4] clobber dependencies:make
run: ceedling --mixin=macos_x64 clobber dependencies:make --verbosity=debug
- name: Run build and test
run: ceedling project:macos verbosity[4] test:all
macos_arm64:
run: ceedling --mixin=macos_x64 clobber test:all --verbosity=debug
macos-arm64:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -203,13 +203,13 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install automake
run: HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf automake libtool
- name: Build dependencies
run: ceedling project:macos_arm64 verbosity[4] clobber dependencies:make
run: ceedling --mixin=macos_arm64 clobber dependencies:make --verbosity=debug
- name: Run build and test
run: ceedling project:macos_arm64 verbosity[4] test:all
run: ceedling --mixin=macos_arm64 clobber test:all --verbosity=debug
windows:
runs-on: windows-2022
strategy:
Expand All @@ -229,7 +229,7 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: gem install ceedling -v 0.31.1 --no-user-install
run: gem install ceedling --no-user-install
- name: Check Ceedling version
run: ceedling version
- name: Set up Visual Studio shell
Expand All @@ -239,13 +239,13 @@ jobs:
- if: ${{ matrix.config.project != 'windows_arm64' }}
# Skip making dependencies for ARM64 as we can only apply git patch once for WolfSSL
name: Build dependencies
run: ceedling project:${{ matrix.config.project }} verbosity[4] clobber dependencies:make
run: ceedling --project=ceedling/${{ matrix.config.project }}.yml clobber dependencies:make --verbosity=debug
- if: ${{ matrix.config.project != 'windows_arm64' }}
name: Run build and test
run: ceedling project:${{ matrix.config.project }} verbosity[4] test:all
run: ceedling --project=ceedling/${{ matrix.config.project }}.yml test:all --verbosity=debug
- if: ${{ matrix.config.project == 'windows_arm64' }}
name: Run build
run: ceedling project:${{ matrix.config.project }} verbosity[4] release
run: ceedling --project=ceedling/${{ matrix.config.project }}.yml release
ios:
runs-on: macos-latest
steps:
Expand All @@ -255,11 +255,11 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install automake
run: HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf automake libtool
- name: Run build
run: ceedling project:ios verbosity[4] release
run: ceedling --project=ceedling/ios.yml release --verbosity=debug
- name: Copy all public headers into the umbrella framework
run: cp public/*.h ios/Lightway/Lightway
- name: Build xcframework
Expand All @@ -275,11 +275,11 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Install automake
run: HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf automake libtool
- name: Run build
run: ceedling project:tvos verbosity[4] release
run: ceedling --project=ceedling/tvos.yml release --verbosity=debug
android:
runs-on: ubuntu-22.04
strategy:
Expand All @@ -293,8 +293,8 @@ jobs:
ruby-version: '3.0'
bundler-cache: true
- name: Install Ceedling
run: sudo gem install ceedling -v 0.31.1 --no-user-install
run: sudo gem install ceedling --no-user-install
- name: Run build
run: |
source android/android_env.sh ${{ matrix.arch }}
ceedling project:android verbosity[4] release
ceedling --mixin=android-${{ matrix.arch }} release --verbosity=debug
26 changes: 0 additions & 26 deletions 3rd_party_deps.yml
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
VERSION 0.8
ARG distro=bullseye
ARG distro=bookworm
FROM --platform=linux/amd64 debian:$distro-slim
WORKDIR /libhelium

debian-deps:
RUN apt-get update
RUN apt-get -y install --no-install-recommends build-essential git automake m4 libtool-bin cmake ruby-full python3-pip
RUN apt-get -y install --no-install-recommends build-essential git automake m4 libtool-bin cmake ruby-full python3-pip clang
# Not including colrm seems to give an error when configuring wolfssl
RUN apt-get -y install --no-install-recommends bsdmainutils
RUN gem install ceedling -v 0.31.1 --no-user-install
RUN gem install ceedling --no-user-install
RUN apt-get -y install --no-install-recommends gcovr

libhelium-deps:
FROM +debian-deps
# Copy in the build configs
COPY *.yml .
COPY --dir project.yml ceedling .
# Make the directory structure so that the config can be parsed
# To improve caching we want to separate this out as the WolfSSL dependency
# fetch and build are the slowest parts of the process.
RUN mkdir -p src include test/support third_party/wolfssl
RUN mkdir -p src/he include test/support third_party/wolfssl
# Copy the patch files
COPY --dir wolfssl ./
# Build and fetch the dependencies
RUN ceedling dependencies:make project:linux
RUN ceedling --mixin=linux_x64 clobber dependencies:make

build:
FROM +libhelium-deps
# Copy in the source and include files
COPY --dir src include ./
# Generate the release
RUN ceedling release project:linux
RUN ceedling --mixin=linux_x64 clobber release
# Store the artifacts
SAVE ARTIFACT build/release/libhelium.a ./libhelium.a AS LOCAL ./artifacts/libhelium.a
SAVE ARTIFACT build/artifacts/compile_commands.json AS LOCAL ./artifacts/compile_commands.json
Expand All @@ -41,13 +41,13 @@ test-copy:
test:
FROM +test-copy
# Run the tests
RUN ceedling test project:linux
RUN ceedling --mixin=linux_x64 test
SAVE ARTIFACT build/artifacts/compile_commands.json AS LOCAL ./artifacts/compile_commands.json

coverage:
FROM +test-copy
# Generate code coverage
RUN ceedling gcov:all utils:gcov project:linux
RUN ceedling --mixin=linux_x64 gcov:all
SAVE ARTIFACT build/artifacts/gcov/*.html AS LOCAL ./artifacts/code_coverage/html/
SAVE ARTIFACT build/artifacts/gcov/*.xml AS LOCAL ./artifacts/code_coverage/xml/

Expand Down
Loading
Loading