Skip to content
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.

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

Fix a broken link in docs plus some cosmetics #241

Merged
merged 2 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions .github/workflows/haskell-ci-simple.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
name: Build
on:
- push
- pull_request
push:
branches:
- master
- ci-*
- release-*
pull_request:
branches:
- master
- ci-*
- release-*

defaults:
run:
Expand All @@ -23,9 +31,9 @@ jobs:
- "8.8.4"
- "8.10.7"
- "9.0.2"
- "9.2.7"
- "9.2.8"
- "9.4.5"
- "9.6.1"
- "9.6.2"
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -80,4 +88,3 @@ jobs:
run: |
cd alex-*/
cabal check

12 changes: 6 additions & 6 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.16.1
# version: 0.16.4
#
# REGENDATA ("0.16.1",["github","alex.cabal"])
# REGENDATA ("0.16.4",["github","alex.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -36,19 +36,19 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.6.1
- compiler: ghc-9.6.2
compilerKind: ghc
compilerVersion: 9.6.1
compilerVersion: 9.6.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.5
compilerKind: ghc
compilerVersion: 9.4.5
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.7
- compiler: ghc-9.2.8
compilerKind: ghc
compilerVersion: 9.2.7
compilerVersion: 9.2.8
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
Expand Down
4 changes: 2 additions & 2 deletions alex.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ category: Development
build-type: Simple

tested-with:
GHC == 9.6.1
GHC == 9.6.2
GHC == 9.4.5
GHC == 9.2.7
GHC == 9.2.8
GHC == 9.0.2
GHC == 8.10.7
GHC == 8.8.4
Expand Down
4 changes: 2 additions & 2 deletions doc/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ Other contributors
~~~~~~~~~~~~~~~~~~

The data is in the Git history.
GitHub can render that in `various ways <https://github.com/simonmar/alex/graphs/contributors>`__.
GitHub can render that in `various ways <https://github.com/haskell/alex/graphs/contributors>`__.

The documentation itself
~~~~~~~~~~~~~~~~~~~~~~~~

This documentation is based the original documentation written by Alex's original authors using DocBook.

It was Converted to reStructuredText / Sphinx / readthedocs.org by Andreas Abel in February 2022.
It was converted to reStructuredText / Sphinx / readthedocs.org by Andreas Abel in February 2022.
2 changes: 1 addition & 1 deletion doc/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Source Code Repository
----------------------

Alex is hosted on `GitHub <https://github.com/haskell/alex>`__.
As previously discussed in `bug-reports`_, we use the built-in `GitHub issue tracker <https://github.com/haskell/alex/issues>`__ for Alex.
As previously discussed in :ref:`bug-reports`, we use the built-in `GitHub issue tracker <https://github.com/haskell/alex/issues>`__ for Alex.
We also use `GitHub pull requests <https://github.com/haskell/alex/pulls>`__ for managing changes;
feel free to submit them!

Expand Down