michael/csci8980-f21
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:wenkokke/sf

Browse source 
I have no idea why this merge is necessary.
This commit is contained in:
wadler 2018-03-12 13:01:33 -03:00
commit 620510e685
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -47,9 +47,10 @@ before_deploy:
- make clean - make clean
deploy: deploy:
edge:
branch: v1.8.47
provider: pages provider: pages
skip-cleanup: true skip-cleanup: true
github-token: $GITHUB_TOKEN # Set in travis-ci.org dashboard, marked secure github-token: $GITHUB_TOKEN
keep-history: true
on: on:
branch: master branch: master

2
Makefile
View file

@ -61,7 +61,7 @@ $(HOME)/agda-master/:
$(HOME)/agda-stdlib-master/: $(HOME)/agda-stdlib-master/:
curl -L https://github.com/agda/agda-stdlib/archive/master.zip -o $(HOME)/agda-stdlib-master.zip curl -L https://github.com/agda/agda-stdlib/archive/master.zip -o $(HOME)/agda-stdlib-master.zip
unzip -qq $(HOME)/agda-stdlib-master.zip -d $(HOME) unzip -qq $(HOME)/agda-stdlib-master.zip -d $(HOME)
mkdir $(HOME)/.agda mkdir -p $(HOME)/.agda
echo "standard-library" > $(HOME)/.agda/defaults echo "standard-library" > $(HOME)/.agda/defaults
echo "$(HOME)/agda-stdlib-master/standard-library.agda-lib" > $(HOME)/.agda/libraries echo "$(HOME)/agda-stdlib-master/standard-library.agda-lib" > $(HOME)/.agda/libraries