Skip to content

Release for agda 2.7 #1206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felixwellen merged 21 commits into from
May 19, 2025
Merged

Release for agda 2.7 #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ec75c30
test new ci script
felixwellen May 9, 2025
2fb5d08
fix
felixwellen May 9, 2025
36fc101
use fix-whitespace action
felixwellen May 9, 2025
8621a15
blindly try stuff
felixwellen May 9, 2025
223699f
blindly try stuff
felixwellen May 9, 2025
13bbf99
blindly try stuff
felixwellen May 9, 2025
ede32ae
untabify...
felixwellen May 9, 2025
65578fa
Revert "blindly try stuff"
felixwellen May 9, 2025
a2b8cca
use fix-whitespace action
felixwellen May 9, 2025
b653f92
whitespace
felixwellen May 9, 2025
fe06077
whitespace
felixwellen May 10, 2025
1299e27
fix
felixwellen May 10, 2025
4912ec7
fix
felixwellen May 10, 2025
474bc65
fix
felixwellen May 10, 2025
1d5c3c5
fix
felixwellen May 10, 2025
b6af0f8
Fix path of fix-whitespace
andreasabel May 10, 2025
0d99cf3
Remove unnecessary step to generate user-manual.pdf
andreasabel May 10, 2025
072b1ad
Bump base in cubical-utils.cabal
andreasabel May 10, 2025
201f68d
bump version number everywhere, update README and RELEASE
felixwellen May 10, 2025
c3daa40
trailing newline needed?
felixwellen May 11, 2025
8f53c89
update flake
ncfavier May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions .github/workflows/ci-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ on:
########################################################################

env:
AGDA_BRANCH: v2.6.4.1
GHC_VERSION: 9.4.7
CABAL_VERSION: 3.6.2.0
AGDA_BRANCH: v2.7.0.1
GHC_VERSION: 9.10.2
CABAL_VERSION: 3.12.1.0
CABAL_INSTALL: cabal install --overwrite-policy=always --ghc-options='-O1 +RTS -M6G -RTS'
CACHE_PATHS: |
~/.cabal/packages
Expand All @@ -67,7 +67,7 @@ jobs:
# absolutely necessary i.e. if we change either the version of Agda,
# ghc, or cabal that we want to use for the build.
- name: Restore external dependencies cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
id: cache-external-restore
with:
path: ${{ env.CACHE_PATHS }}
Expand All @@ -82,23 +82,13 @@ jobs:
run: |
git clone https://github.com/agda/agda --branch ${{ env.AGDA_BRANCH }} --depth=1
cd agda
mkdir -p doc
touch doc/user-manual.pdf
${{ env.CABAL_INSTALL }}
cd ..
rm -rf agda

- name: Download and install fix-whitespace
if: steps.cache-external-restore.outputs.cache-hit != 'true'
run: |
git clone https://github.com/agda/fix-whitespace --depth=1
cd fix-whitespace
${{ env.CABAL_INSTALL }} fix-whitespace.cabal
cd ..

- name: Save external dependencies cache
if: steps.cache-external-restore.outputs.cache-hit != 'true'
uses: actions/cache/save@v3
uses: actions/cache/save@v4
id: cache-external-save
with:
path: ${{ env.CACHE_PATHS }}
Expand All @@ -110,34 +100,37 @@ jobs:

# By default github actions do not pull the repo
- name: Checkout cubical
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get and run fix-whitespace
uses: andreasabel/fix-whitespace-action@v1

########################################################################
## TESTING
########################################################################

- name: Restore library cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
id: cache-library-restore
with:
path: ./_build
key: library-${{ runner.os }}-${{ env.GHC_VERSION }}-${{ env.CABAL_VERSION }}-${{ env.AGDA_BRANCH }}-${{ hashFiles('Cubical/**', 'cubical.agda-lib', 'Everythings.hs') }}
restore-keys: |
library-${{ runner.os }}-${{ env.GHC_VERSION }}-${{ env.CABAL_VERSION }}-${{ env.AGDA_BRANCH }}-

- name: Put cabal programs in PATH
- name: Put installed programs in PATH
run: echo "~/.cabal/bin" >> "${GITHUB_PATH}"

- name: Test cubical
run: |
make test \
AGDA_EXEC='~/.cabal/bin/agda -WnoUnsupportedIndexedMatch -W error' \
FIX_WHITESPACE='~/.cabal/bin/fix-whitespace' \
FIX_WHITESPACE='~/.local/fix-whitespace/bin/fix-whitespace' \
EVERYTHINGS='cabal run Everythings'

- name: Save library cache
if: steps.cache-library-restore.outputs.cache-hit != 'true'
uses: actions/cache/save@v3
uses: actions/cache/save@v4
id: cache-library-save
with:
path: ./_build
Expand All @@ -152,12 +145,12 @@ jobs:
run: |
make listings \
AGDA_EXEC='~/.cabal/bin/agda -WnoUnsupportedIndexedMatch -W error' \
FIX_WHITESPACE='~/.cabal/bin/fix-whitespace' \
FIX_WHITESPACE='~/.local/fix-whitespace/bin/fix-whitespace' \
EVERYTHINGS='cabal run Everythings'

- name: Deploy to GitHub Pages
if: github.event_name == 'push' && github.ref_name == 'master'
uses: JamesIves/github-pages-deploy-action@4.1.8
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: gh-pages
folder: html
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ message: "If you use this software, please cite it as below."
authors:
- name: "The Agda Community"
title: "Cubical Agda Library"
version: 0.7
date-released: 2024-02-12
version: 0.8
date-released: 2025-05-09
url: "https://github.com/agda/cubical"
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ For detailed install instructions see the
[INSTALL](https://github.com/agda/cubical/blob/master/INSTALL.md)
file.
If you want to use some specific release of Agda,
the following table lists which releases of Agda you can use with which release of this library.
the following table lists which releases of Agda are known to work with which release of this library.
Most likely, a lot more combinations work as well.
Agda versions as written below, correspond to tags.

| cubical library version | Agda versions |
|-------------------------|--------------------------------|
| current master | `v2.6.4` `v2.6.4.1` `v2.6.4.3` |
| current master | `v2.7.0.1` |
| `v0.8` | `v2.6.4.1` `v2.7.0.1` |
| `v0.7` | `v2.6.4` `v2.6.4.1` |
| `v0.6` | `v2.6.4` |
| `v0.5` | `v2.6.3` `v2.6.4` |
Expand Down
2 changes: 2 additions & 0 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ Fill in the form with something like this:
zip -r cubical-0.5.zip cubical
tar cfz cubical-0.5.tar.gz cubical
```

Create and push a tag for the new version of the library.
4 changes: 2 additions & 2 deletions cubical-utils.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ cabal-version: >= 1.10
build-type: Simple
description: Helper programs.
license: MIT
tested-with: GHC == 8.6.5
tested-with: GHC == 9.10.2

executable Everythings
hs-source-dirs: .
main-is: Everythings.hs
default-language: Haskell2010
build-depends: base >= 4.9.0.0 && < 4.20
build-depends: base >= 4.9.0.0 && < 4.22
, directory >= 1.0.0.0 && < 1.4
2 changes: 1 addition & 1 deletion cubical.agda-lib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: cubical-0.7
name: cubical-0.8
include: .
depend:
flags: --cubical --no-import-sorts -WnoUnsupportedIndexedMatch
66 changes: 50 additions & 16 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
flake = false;
};
inputs.agda = {
url = "github:agda/agda/v2.6.4.1";
url = "github:agda/agda/v2.7.0.1";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};

Expand All @@ -21,7 +20,7 @@
overlay = final: prev: {
cubical = final.agdaPackages.mkDerivation rec {
pname = "cubical";
version = "0.7";
version = "0.8";

src = cleanSourceWith {
filter = name: type:
Expand All @@ -47,7 +46,7 @@
};
agdaWithCubical = final.agdaPackages.agda.withPackages [final.cubical];
};
overlays = [ agda.overlay overlay ];
overlays = [ agda.overlays.default overlay ];
in
{ overlays.default = overlay; } //
flake-utils.lib.eachDefaultSystem (system:
Expand Down