[ ci ] update to cope with new doc/ directory

agda · Oct 26, 2023 · aed1bd2 · aed1bd2
1 parent 98843ee
commit aed1bd2
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 14 deletions.
diff --git a/travis/agda-logo.svg → .github/tooling/agda-logo.svg b/travis/agda-logo.svg → .github/tooling/agda-logo.svg
diff --git a/travis/index.agda → .github/tooling/index.agda b/travis/index.agda → .github/tooling/index.agda
diff --git a/travis/index.sh → .github/tooling/index.sh b/travis/index.sh → .github/tooling/index.sh
diff --git a/travis/landing-bottom.html → .github/tooling/landing-bottom.html b/travis/landing-bottom.html → .github/tooling/landing-bottom.html
diff --git a/travis/landing-top.html → .github/tooling/landing-top.html b/travis/landing-top.html → .github/tooling/landing-top.html
diff --git a/travis/landing.sh → .github/tooling/landing.sh b/travis/landing.sh → .github/tooling/landing.sh
diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
@@ -50,7 +50,7 @@ env:
   CABAL_VERSION: 3.6.2.0
   CABAL_INSTALL: cabal v1-install --ghc-options='-O1 +RTS -M6G -RTS'
   # CABAL_INSTALL: cabal install --overwrite-policy=always --ghc-options='-O1 +RTS -M6G -RTS'
-  AGDA: agda -Werror +RTS -M3.5G -H3.5G -A128M -RTS -i. -i src/
+  AGDA: agda -Werror +RTS -M3.5G -H3.5G -A128M -RTS -i. -isrc -idoc
 
 jobs:
   test-stdlib:
@@ -152,7 +152,7 @@ jobs:
       - name: Test stdlib
         run: |
           cabal run GenerateEverything
-          cp travis/* .
+          cp .github/tooling/* .
           ./index.sh
           ${{ env.AGDA }} --safe EverythingSafe.agda
           ${{ env.AGDA }} index.agda

diff --git a/GNUmakefile b/GNUmakefile
@@ -9,11 +9,14 @@ AGDA=$(AGDA_EXEC) $(AGDA_OPTIONS) $(AGDA_RTS_OPTIONS)
 #   cabal install fix-whitespace
 
 test: Everything.agda check-whitespace
-	$(AGDA) -i. -isrc README.agda
+	cd doc && $(AGDA) README.agda
 
 testsuite:
 	$(MAKE) -C tests test AGDA="$(AGDA)" AGDA_EXEC="$(AGDA_EXEC)" only=$(only)
 
+fix-whitespace:
+	cabal exec -- fix-whitespace
+
 check-whitespace:
 	cabal exec -- fix-whitespace --check
 
@@ -25,7 +28,7 @@ Everything.agda:
 
 .PHONY: listings
 listings: Everything.agda
-	$(AGDA) -i. -isrc --html README.agda -v0
+	cd doc && $(AGDA) --html README.agda -v0
 
 clean :
 	find . -type f -name '*.agdai' -delete
diff --git a/notes/release-guide.txt b/notes/release-guide.txt
@@ -61,20 +61,12 @@ procedure should be followed:
 * Announce the release of the new version on the Agda mailing lists
   (users and developers).
 
-* Add v$VERSION to the list of protected directories in the .travis.yml
-  file of BOTH master and experimental. They should look something like:
-
-  >  git checkout HEAD -- v0.16/ v0.17/ v1.0/ v1.1/ (...)
-
-  Commit & push these changes. This will prevent the next step from being
-  overwritten by travis.
-
 * Generate and upload documentation for the released version:
 
-    cp travis/* .
+    cp .github/tooling/* .
     runhaskell GenerateEverything.hs
     ./index.sh
-    agda -i. -isrc --html index.agda
+    agda -i. -idoc -isrc --html index.agda
     mv html v$VERSION
     git checkout gh-pages
     git add v$VERSION/*.html v$VERSION/*.css