Skip to content

Commit

Permalink
ci: debug linux install target
Browse files Browse the repository at this point in the history
  • Loading branch information
stevana committed Nov 4, 2024
1 parent 764ff2e commit c5c4b34
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04, macos-15, windows-2022]
# os: [ubuntu-24.04, macos-15, windows-2022]
os: [ubuntu-24.04]
ghc-version: ['9.6.6']
cabal-version: ['3.12.1.0']
env:
Expand Down Expand Up @@ -250,6 +251,7 @@ jobs:
with:
name: ${{ env.platform }}
path: bin/*
if-no-files-found: error

release:
name: Create release
Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ else
endif

ifeq ($(GITHUB_ACTIONS),true)
SPEX_BIN := "bin"
SPEX_BIN := bin
else
SPEX_BIN := $(or $(XDG_BIN_HOME),$(HOME)/.local/bin)
NEW_VERSION = "$(shell awk -F '=' '/^new-version/ \
Expand All @@ -45,7 +45,6 @@ ifeq ($(OS),linux)
--volume $(PWD):/mnt \
--volume $(HOME)/.cache/cabal/packages:/root/.cache/cabal/packages \
--volume $(HOME)/.cabal/store:/root/.local/state/cabal/store \
--volume $(PWD)/dist-newstyle:/mnt/dist-newstyle \
--env SPEX_GIT_COMMIT=$(SPEX_GIT_COMMIT) \
ghcr.io/spex-lang/spex-build:latest
ENABLE_STATIC := --enable-executable-static
Expand All @@ -54,7 +53,6 @@ ifeq ($(OS),linux)
--volume $(PWD):/mnt \
--volume $(PWD)/.container-cache/cabal/packages:/root/.cache/cabal/packages \
--volume $(PWD)/.container-cache/cabal/store:/root/.local/state/cabal/store \
--volume $(PWD)/dist-newstyle:/mnt/dist-newstyle \
--env SPEX_GIT_COMMIT=$(SPEX_GIT_COMMIT) \
ghcr.io/spex-lang/spex-build:latest
ENABLE_STATIC := --enable-executable-static
Expand Down Expand Up @@ -117,6 +115,9 @@ install:
# container, which isn't what we want. Instead find the binary inside
# dist-newstyle, which is shared with the host via a volume mount, and
# copy it from there to the right place.
ls -lh dist-newstyle/build/x86_64-linux/ghc-9.6.6/spex-0.0.0/x/spex/build/spex/spex || true
ls -Rlh .
find dist-newstyle/ -name 'spex*' -type f -executable -print
find dist-newstyle/ -name 'spex*' -type f -executable -exec cp {} $(SPEX_BIN) \;
else
$(CABAL) install all --installdir=$(SPEX_BIN) --install-method=copy --overwrite-policy=always
Expand Down

0 comments on commit c5c4b34

Please sign in to comment.