From b34652b8192cbea25cae139e2535cc27c5d4fdb7 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 10 Oct 2023 11:05:52 +0200 Subject: [PATCH] Update CI for v1.7.3: Use Agda 2.6.4; deploy HTML to v1.7.3 subdirectory --- .github/workflows/ci-ubuntu.yml | 44 +++++++++------------------------ 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index 70773cd832..aac9846e8b 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -1,13 +1,7 @@ name: Ubuntu build on: push: - branches: - - master - - experimental pull_request: - branches: - - master - - experimental ######################################################################## ## CONFIGURATION @@ -46,8 +40,8 @@ on: ######################################################################## env: - GHC_VERSION: 8.6.5 - CABAL_VERSION: 3.2.0.0 + GHC_VERSION: 9.6.3 + CABAL_VERSION: 3.10.1.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/ @@ -71,22 +65,10 @@ jobs: - name: Initialise variables run: | - if [[ '${{ github.ref }}' == 'refs/heads/master' \ - || '${{ github.base_ref }}' == 'master' ]]; then - # Pick Agda version for master - echo "AGDA_COMMIT=tags/v2.6.1.3.20210524" >> $GITHUB_ENV; - echo "AGDA_HTML_DIR=html" >> $GITHUB_ENV - elif [[ '${{ github.ref }}' == 'refs/heads/experimental' \ - || '${{ github.base_ref }}' == 'experimental' ]]; then - # Pick Agda version for experimental - echo "AGDA_COMMIT=9047e32a1b0cba98a299ed439a08d35bc4846f99" >> $GITHUB_ENV; - echo "AGDA_HTML_DIR=html/experimental" >> $GITHUB_ENV - fi - - if [[ '${{ github.ref }}' == 'refs/heads/master' \ - || '${{ github.ref }}' == 'refs/heads/experimental' ]]; then - echo "AGDA_DEPLOY=true" >> $GITHUB_ENV - fi + echo "AGDA_COMMIT=tags/v2.6.4" >> "$GITHUB_ENV" + echo "AGDA_HTML_DIR=html/v1.7.3" >> "$GITHUB_ENV" + echo "AGDA_DEPLOY=true" >> "$GITHUB_ENV" + ######################################################################## ## CACHING @@ -98,7 +80,7 @@ jobs: # i.e. if we change either the version of Agda, ghc, or cabal that we want # to use for the build. - name: Cache cabal packages - uses: actions/cache@v2 + uses: actions/cache@v3 id: cache-cabal with: path: | @@ -113,16 +95,14 @@ jobs: - name: Install cabal if: steps.cache-cabal.outputs.cache-hit != 'true' - uses: actions/setup-haskell@v1.1.3 + uses: haskell-actions/setup@v2 with: ghc-version: ${{ env.GHC_VERSION }} cabal-version: ${{ env.CABAL_VERSION }} + cabal-update: true - name: Put cabal programs in PATH - run: echo "~/.cabal/bin" >> $GITHUB_PATH - - - name: Cabal update - run: cabal update + run: echo "~/.cabal/bin" >> "$GITHUB_PATH" - name: Download and install Agda from github if: steps.cache-cabal.outputs.cache-hit != 'true' @@ -141,7 +121,7 @@ jobs: # By default github actions do not pull the repo - name: Checkout stdlib - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Test stdlib run: | @@ -188,4 +168,4 @@ jobs: with: branch: gh-pages folder: html - git-config-name: Github Actions \ No newline at end of file + git-config-name: Github Actions