Skip to content

Commit

Permalink
Add test-submodules "make" target, use it in GitHub CI
Browse files Browse the repository at this point in the history
  • Loading branch information
cgay committed Dec 29, 2024
1 parent ed236ed commit 12428c3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
run: |
mkdir -p ${DYLAN}
make install
ls -l ${DYLAN}/bin/
ldd ${DYLAN}/bin/deft
- name: Exercise deft
env:
Expand All @@ -55,3 +57,11 @@ jobs:
${exe} list
${exe} build abc-test-suite
_build/bin/abc-test-suite
- name: Run test suite using submodules
env:
DYLAN_CATALOG: ext/pacman-catalog
DYLAN: dylan-root
run: |
mkdir -p ${DYLAN}
make test-submodules
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
# Low-tech Makefile to build and install deft.

DYLAN ?= $${HOME}/dylan
install_dir = $(DYLAN)/install/deft
install_bin = $(install_dir)/bin
install_lib = $(install_dir)/lib
link_target = $(install_bin)/deft-app
link_source = $(DYLAN)/bin/dylan

git_version := "$(shell git describe --tags --always --match 'v*')"

.PHONY: build build-with-version clean install install-debug really-install remove-deft-artifacts test dist distclean
.PHONY: build build-with-version clean install install-debug really-install remove-deft-artifacts test test-submodules dist distclean

build: remove-deft-artifacts
OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry dylan-compiler -build -unify deft-app
Expand Down Expand Up @@ -47,6 +42,12 @@ test: build
dylan-compiler -build deft-test-suite \
&& DYLAN_CATALOG=ext/pacman-catalog _build/bin/deft-test-suite

# Deft also needs to be buildable with submodules so that it can be built on new
# platforms without having to manually install deps.
test-submodules: distclean
dylan-compiler -build deft-test-suite \
&& DYLAN_CATALOG=ext/pacman-catalog _build/bin/deft-test-suite

dist: distclean install

# Sometimes I use deft to develop deft, so this makes sure to clean
Expand All @@ -58,7 +59,6 @@ remove-deft-artifacts:
clean: remove-deft-artifacts
rm -rf _build
rm -rf _test
rm -rf *~

distclean: clean
rm -rf $(install_dir)
rm -f $(link_source)

0 comments on commit 12428c3

Please sign in to comment.