Edited makefile and workflow to use system GHC.
This commit is contained in:
Wen Kokke
parent
a40bd03d35
commit
d697a4f322
3 changed files with 26 additions and 39 deletions
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
|
|
@ -54,7 +54,9 @@ jobs:
|
|||
run: sudo gem install html-proofer
|
||||
|
||||
- name: Build website
|
||||
run: make build
|
||||
run: |
|
||||
STACK="stack --system-ghc --no-install-ghc" make build
|
||||
|
||||
- name: Test website
|
||||
run: make test
|
||||
run: |
|
||||
STACK="stack --system-ghc --no-install-ghc" make test
|
||||
|
|
|
|||
31
Makefile
31
Makefile
|
|
@ -3,13 +3,16 @@
|
|||
# Configuration
|
||||
#################################################################################
|
||||
|
||||
MAKE ?= make
|
||||
STACK ?= stack
|
||||
|
||||
SITE_DIR := _site
|
||||
RAW_DIR := $(SITE_DIR)/raw
|
||||
CACHE_DIR := _cache
|
||||
TMP_DIR := $(CACHE_DIR)/tmp
|
||||
|
||||
AGDA := stack exec agda -- --no-libraries --include-path=standard-library/src
|
||||
PANDOC := stack exec pandoc --
|
||||
AGDA := $(STACK) exec agda -- --no-libraries --include-path=standard-library/src
|
||||
PANDOC := $(STACK) exec pandoc --
|
||||
|
||||
|
||||
#################################################################################
|
||||
|
|
@ -18,15 +21,15 @@ PANDOC := stack exec pandoc --
|
|||
|
||||
.PHONY: all
|
||||
all:
|
||||
@make build
|
||||
@make epub-build
|
||||
@make pdf-build
|
||||
@$(MAKE) build
|
||||
@$(MAKE) epub-build
|
||||
@$(MAKE) pdf-build
|
||||
|
||||
.PHONY: all-clean
|
||||
all-clean:
|
||||
@make clean
|
||||
@make epub-clean
|
||||
@make pdf-clean
|
||||
@$(MAKE) clean
|
||||
@$(MAKE) epub-clean
|
||||
@$(MAKE) pdf-clean
|
||||
|
||||
#################################################################################
|
||||
# Setup Git Hooks
|
||||
|
|
@ -45,7 +48,7 @@ init: setup-check-fix-whitespace setup-install-htmlproofer
|
|||
.PHONY: build
|
||||
build: standard-library/ChangeLog.md
|
||||
@echo "Building site"
|
||||
@stack build && stack exec site build
|
||||
@$(STACK) build && $(STACK) exec site build
|
||||
|
||||
standard-library/ChangeLog.md:
|
||||
@echo "Updating Agda standard library"
|
||||
|
|
@ -81,7 +84,7 @@ test: setup-install-htmlproofer build
|
|||
.PHONY: watch
|
||||
watch: standard-library/ChangeLog.md
|
||||
@echo "Watching for changes and rebuilding"
|
||||
@stack build && stack exec site watch
|
||||
@$(STACK) build && $(STACK) exec site watch
|
||||
|
||||
|
||||
#################################################################################
|
||||
|
|
@ -91,7 +94,7 @@ watch: standard-library/ChangeLog.md
|
|||
.PHONY: update-contributors
|
||||
update-contributors:
|
||||
@echo "Updating contributors from GitHub"
|
||||
@stack build && stack exec update-contributors
|
||||
@$(STACK) build && $(STACK) exec update-contributors
|
||||
|
||||
|
||||
#################################################################################
|
||||
|
|
@ -101,7 +104,7 @@ update-contributors:
|
|||
.PHONY: clean
|
||||
clean: standard-library/ChangeLog.md
|
||||
@echo "Cleaning generated files for site"
|
||||
@stack build && stack exec site clean
|
||||
@$(STACK) build && $(STACK) exec site clean
|
||||
|
||||
|
||||
#################################################################################
|
||||
|
|
@ -120,10 +123,10 @@ list:
|
|||
|
||||
.PHONY: publish
|
||||
publish: setup-check-rsync
|
||||
@make all
|
||||
@$(MAKE) all
|
||||
@echo "Cleaning intermediate files"
|
||||
rm -rf $(RAW_DIR)
|
||||
@make test
|
||||
@$(MAKE) test
|
||||
@echo "Creating web branch"
|
||||
git fetch --all
|
||||
git checkout -b web --track origin/web
|
||||
|
|
|
|||
28
stack.yaml
28
stack.yaml
|
|
@ -1,42 +1,24 @@
|
|||
resolver: lts-17.2
|
||||
|
||||
# Use GHC 8.10.5
|
||||
compiler: ghc-8.10.5
|
||||
compiler-check: match-exact
|
||||
|
||||
# Allow never versions of packages
|
||||
allow-newer: true
|
||||
|
||||
flags:
|
||||
pandoc:
|
||||
embed_data_files: true
|
||||
|
||||
packages:
|
||||
- .
|
||||
|
||||
allow-newer: true
|
||||
extra-deps:
|
||||
|
||||
# Agda dependencies:
|
||||
- Agda-2.6.1.3@sha256:87769ebab4259b184c5b11d5beaff39b88bcc37902dfb3341f4fc46c5c7d3134,32945
|
||||
|
||||
# Hakyll dependencies:
|
||||
- hakyll-4.13.4.1
|
||||
- pandoc-2.10.1@sha256:23d7ec480c7cb86740475a419d6ca4819987b6dd23bbae9b50bc3d42a7ed2f9f,36933
|
||||
- pandoc-citeproc-0.17.0.2@sha256:39c5c60a5eca2c1cb50ae9a00dc7093ca1baac78ad5be4e222505de257dce456,8737
|
||||
- commonmark-0.1.1.4@sha256:8717891c53c124ff64187c463619450241a41c0951cda2a43267d40f78992362,3278
|
||||
- commonmark-extensions-0.2.0.4@sha256:6a437bcfa3c757af4262b71336513619990eafb5cfdc33e57a499c93ad225608,3184
|
||||
- commonmark-pandoc-0.2.0.1@sha256:529c6e2c6cabf61558b66a28123eafc1d90d3324be29819f59f024e430312c1f,1105
|
||||
|
||||
# Sass dependencies:
|
||||
- hsass-0.8.0@sha256:05fb3d435dbdf9f66a98db4e1ee57a313170a677e52ab3a5a05ced1fc42b0834,2899
|
||||
- hlibsass-0.1.10.1@sha256:08db56c633e9a83a642d8ea57dffa93112b092d05bf8f3b07491cfee9ee0dfa5,2565
|
||||
|
||||
# GitHub API dependencies:
|
||||
- github-0.26@sha256:a9d4046325c3eb28cdc7bef2c3f5bb213328caeae0b7dce6f51de655f0bffaa1,7162
|
||||
- binary-instances-1.0.0.1@sha256:e234be994da675479a3661f050d4a1d53565c9ed7786d9a68b7a29ba8b54b5a7,2659
|
||||
|
||||
# Regex dependencies:
|
||||
- text-regex-replace-0.1.1.3@sha256:e7f612df671c93ced54a3d26528db37852069884e5cb67d5afbb49d3defb5eb9,1627
|
||||
|
||||
# Version of text-icu compatible with icu68+
|
||||
- text-icu-0.7.1.0@sha256:44e8b5966fcf61356a7356f3d2e8a5c5cc538170a15e94ff7b79b9f48ce9fd2f,3497
|
||||
compiler-check: match-exact
|
||||
install-ghc: false
|
||||
compiler: ghc-8.10.5
|
||||
resolver: lts-17.2
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue