Skip to content

Commit 81311db

Browse files
Use _x64 prefix for linux and mac
1 parent 2401645 commit 81311db

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
git checkout -b "$branch" || true
3333
- name: Run build
3434
run: earthly --ci +all --distro=${{ matrix.distro }}
35-
linux:
35+
linux-x64:
3636
runs-on: ubuntu-22.04
3737
steps:
3838
- uses: actions/checkout@v4
@@ -43,13 +43,13 @@ jobs:
4343
- name: Install Ceedling
4444
run: sudo gem install ceedling --no-user-install
4545
- name: Build dependencies
46-
run: ceedling --mixin=linux clobber dependencies:make --verbosity=debug
46+
run: ceedling --mixin=linux_x64 clobber dependencies:make --verbosity=debug
4747
- name: Run wolfSSL Tests
4848
run: |
4949
cd third_party/wolfssl/source
5050
./wolfcrypt/test/testwolfcrypt
5151
- name: Run build and test
52-
run: ceedling --mixin=linux test:all --verbosity=debug
52+
run: ceedling --mixin=linux_x64 test:all --verbosity=debug
5353
linux-multithread:
5454
runs-on: ubuntu-22.04
5555
steps:
@@ -178,7 +178,7 @@ jobs:
178178
QEMU_LD_PREFIX=/usr/riscv64-linux-gnu ./wolfcrypt/test/testwolfcrypt
179179
- name: Run build
180180
run: CC="riscv64-linux-gnu-gcc" ceedling --mixin=linux_riscv64 release --verbosity=debug
181-
macos:
181+
macos-x64:
182182
runs-on: macos-13
183183
steps:
184184
- uses: actions/checkout@v4
@@ -191,10 +191,10 @@ jobs:
191191
- name: Install automake
192192
run: HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf automake libtool
193193
- name: Build dependencies
194-
run: ceedling --mixin=macos clobber dependencies:make --verbosity=debug
194+
run: ceedling --mixin=macos_x64 clobber dependencies:make --verbosity=debug
195195
- name: Run build and test
196-
run: ceedling --mixin=macos clobber test:all --verbosity=debug
197-
macos_arm64:
196+
run: ceedling --mixin=macos_x64 clobber test:all --verbosity=debug
197+
macos-arm64:
198198
runs-on: macos-latest
199199
steps:
200200
- uses: actions/checkout@v4

Earthfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ libhelium-deps:
2222
# Copy the patch files
2323
COPY --dir wolfssl ./
2424
# Build and fetch the dependencies
25-
RUN ceedling --mixin=linux clobber dependencies:make
25+
RUN ceedling --mixin=linux_x64 clobber dependencies:make
2626

2727
build:
2828
FROM +libhelium-deps
2929
# Copy in the source and include files
3030
COPY --dir src include ./
3131
# Generate the release
32-
RUN ceedling --mixin=linux clobber release
32+
RUN ceedling --mixin=linux_x64 clobber release
3333
# Store the artifacts
3434
SAVE ARTIFACT build/release/libhelium.a ./libhelium.a AS LOCAL ./artifacts/libhelium.a
3535
SAVE ARTIFACT build/artifacts/compile_commands.json AS LOCAL ./artifacts/compile_commands.json
@@ -41,13 +41,13 @@ test-copy:
4141
test:
4242
FROM +test-copy
4343
# Run the tests
44-
RUN ceedling --mixin=linux test
44+
RUN ceedling --mixin=linux_x64 test
4545
SAVE ARTIFACT build/artifacts/compile_commands.json AS LOCAL ./artifacts/compile_commands.json
4646

4747
coverage:
4848
FROM +test-copy
4949
# Generate code coverage
50-
RUN ceedling --mixin=linux gcov:all
50+
RUN ceedling --mixin=linux_x64 gcov:all
5151
SAVE ARTIFACT build/artifacts/gcov/*.html AS LOCAL ./artifacts/code_coverage/html/
5252
SAVE ARTIFACT build/artifacts/gcov/*.xml AS LOCAL ./artifacts/code_coverage/xml/
5353

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)