Skip to content

Commit

Permalink
adjust CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mkannwischer committed Jul 29, 2024
1 parent fb54147 commit 61594cf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 22 deletions.
20 changes: 5 additions & 15 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,16 @@ on:
branches: [ "main" ]
jobs:
test:
strategy:
matrix:
target: [cross-v8a, cross-v84a]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true
- name: install dependencies
run: sudo apt install gcc-aarch64-linux-gnu qemu-user
- name: Run Dilithium NTT Tests
- name: Run tests
run: |
make run-cross-ntt_dilithium
- name: Run Kyber NTT Tests
run: |
make run-cross-ntt_kyber
- name: Run Kyber NTT Tests
run: |
make run-cross-ntt_kyber
- name: Run X25519 Tests
run: |
make run-cross-x25519
- name: Run Keccak Tests
run: |
make clean
make run-cross-keccak_neon
make runall-${{ matrix.target }}
12 changes: 5 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ elfname = $(addsuffix -test.elf,$(subst /,-,$1))


platformtests := $(foreach test,$(TESTS), $(call testplatforms,$(test)))
platforms = $(sort $(foreach test,$(platformtests),$(firstword $(subst _, ,$(test)))))

builds := $(addprefix build-, $(platformtests))
runs := $(addprefix run-, $(platformtests))
checks := $(addprefix check-, $(platformtests))
runsplatform := $(addprefix runall-, $(platforms))
cleans := $(addprefix clean-, $(platformtests))


Expand All @@ -42,12 +43,9 @@ ${runs}: run-%:
.PHONY: run
run: ${runs}

.PHONY: ${checks}
${checks}: check-%:
make -C envs/$(platform) check CFLAGS_EXTRA='$(call testcflags,$(test))' SOURCES='$(call testsources,$(test),../../)' ASMS='$(call testasms,$(test),../../)' TARGET=$(call elfname,$(test)) TESTDIR=$(call testdir,$(test),../../)

.PHONY: check
check: ${checks}
.PHONY:${runsplatform}
${runsplatform}:
make $(filter run-$(subst runall-,,$@)_%, $(runs))

.PHONY: ${cleans}
${cleans}: clean-%:
Expand Down

0 comments on commit 61594cf

Please sign in to comment.