Skip to content

Commit

Permalink
Makefile: create both deft exe symlink deft-app for back compat
Browse files Browse the repository at this point in the history
Some GitHub workflows expect the exe to be named "deft" (as it should be) rather than
"deft-app" (as it is). Fix it and leave a symlink to be backward compatible.
  • Loading branch information
cgay committed Dec 8, 2024
1 parent 1843af9 commit e7d0ca8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ jobs:
DYLAN_CATALOG: ext/pacman-catalog
DYLAN: dylan-root
run: |
echo "exe: ${DYLAN}/bin/deft-app"
ls -l ${DYLAN}/bin/deft-app
exe="$(realpath ${DYLAN}/bin/deft-app)"
export DYLAN_CATALOG="$(realpath ${DYLAN_CATALOG})"
${exe} new library --force-package abc strings@1.1
Expand Down
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,14 @@ build-with-version: remove-deft-artifacts
dylan-compiler -build -unify deft-app; \
cp -p $${orig} $${file}

# Until the install-deft GitHub Action is no longer referring to deft-app
# we also create a link named deft-app.
really-install:
mkdir -p $(DYLAN)/bin
cp _build/sbin/deft-app $(DYLAN)/bin/
echo $(DYLAN)/bin
cp _build/sbin/deft-app $(DYLAN)/bin/deft
ln -f $(DYLAN)/bin/deft $(DYLAN)/bin/deft-app
ls -l $(DYLAN)/bin/

install: build-with-version really-install

Expand Down

0 comments on commit e7d0ca8

Please sign in to comment.