Skip to content

Commit c6d2073

Browse files
committed
Optimize CI REPL run
1 parent 62ee3b4 commit c6d2073

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ jobs:
6868
6969
- name: Build KMCC repl
7070
run: |
71-
make CURRYBIN_REPL_PAKCS_ARG= CYPM=$PWD/cypm PAKCS=$PWD/pakcs bin/kmcc_repl
72-
# twice, to generate with pakcs and then with kmcc
73-
make CURRYBIN_REPL_PAKCS_ARG="-d CURRYBIN=$(BINDIR)/kmcc" CYPM=$PWD/cypm PAKCS=$PWD/pakcs bin/kmcc_repl
71+
make CURRYBIN_REPL_PAKCS_ARG= CURRYBIN_REPL_PAKCS_ARG_2="-d CURRYBIN=$(BINDIR)/kmcc" CYPM=$PWD/cypm PAKCS=$PWD/pakcs bin/kmcc_repl
7472
7573
- name: List produced binaries
7674
run: ls -l bin

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ GIT_HISTORY_AVAILABLE := $(shell ! test -d "$(ROOT)/.git"; echo $$?)
3636
# since that would try to run a dockerized pakcs from within a dockerized pakcs-cypm, which is not possible.
3737
# On CI, this is fixed by overriding this variable with no argument.
3838
CURRYBIN_REPL_PAKCS_ARG = -d CURRYBIN=$(PAKCS)
39+
CURRYBIN_REPL_PAKCS_ARG_2 =
3940

4041
# Compiler version from the compiler cabal file
4142
export VERSION := $(shell head -3 $(ROOT)/compiler/kmcc.cabal | tail -1 | cut -c21-)
@@ -95,7 +96,7 @@ ifeq (,$(wildcard bin/kmcc_repl)) # build REPL using PAKCS, since we need the RE
9596
fi
9697
cd repl && $(CYPM) $(CURRYBIN_REPL_PAKCS_ARG) -d BININSTALLPATH=$(BINDIR) install
9798
# recompile using the newly built REPL:
98-
cd repl && $(CYPM) -d BININSTALLPATH=$(BINDIR) install
99+
cd repl && $(CYPM) $(CURRYBIN_REPL_PAKCS_ARG_2) -d BININSTALLPATH=$(BINDIR) install
99100
else
100101
cd repl && $(CYPM) -d BININSTALLPATH=$(BINDIR) install
101102
endif

0 commit comments

Comments
 (0)