Skip to content

Commit

Permalink
Update few broken links, bump to lateset ghc patch versions in CI (#440)
Browse files Browse the repository at this point in the history
* Update few broken links

* Add ghc 9.4.4 to ci config

* Revert adding ghc 9.4.4
  • Loading branch information
jhrcek authored Jan 12, 2023
1 parent a9f785e commit 029e0bf
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 19 deletions.
40 changes: 26 additions & 14 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,35 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.13.20211030
# version: 0.15.20221225
#
# REGENDATA ("0.13.20211030",["github","turtle.cabal"])
# REGENDATA ("0.15.20221225",["github","turtle.cabal"])
#
name: Haskell-CI
on:
- push
- pull_request
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
timeout-minutes:
60
container:
image: buildpack-deps:bionic
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.2.1
- compiler: ghc-9.2.5
compilerKind: ghc
compilerVersion: 9.2.1
compilerVersion: 9.2.5
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.1
- compiler: ghc-9.0.2
compilerKind: ghc
compilerVersion: 9.0.1
setup-method: hvr-ppa
compilerVersion: 9.0.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.10.7
compilerKind: ghc
Expand All @@ -60,6 +63,11 @@ jobs:
compilerVersion: 8.2.2
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.0.2
compilerKind: ghc
compilerVersion: 8.0.2
setup-method: hvr-ppa
allow-failure: false
fail-fast: false
steps:
- name: apt
Expand All @@ -68,18 +76,18 @@ jobs:
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
else
apt-add-repository -y 'ppa:hvr/ghc'
apt-get update
apt-get install -y "$HCNAME"
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
fi
env:
HCKIND: ${{ matrix.compilerKind }}
Expand Down Expand Up @@ -139,6 +147,10 @@ jobs:
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
cat >> $CABAL_CONFIG <<EOF
program-default-options
ghc-options: $GHCJOBS +RTS -M3G -RTS
EOF
cat $CABAL_CONFIG
- name: versions
run: |
Expand Down Expand Up @@ -217,7 +229,7 @@ jobs:
${CABAL} -vnormal check
- name: haddock
run: |
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
- name: unconstrained build
run: |
rm -f cabal.project.local
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ state changes are made to the process's global state.

## Development Status

[![Build Status](https://travis-ci.org/Gabriella439/Haskell-Turtle-Library.png)](https://travis-ci.org/Gabriella439/Haskell-Turtle-Library)
[![Build Status](https://github.com/Gabriella439/turtle/actions/workflows/haskell-ci.yml/badge.svg)](https://github.com/Gabriella439/turtle/actions/workflows/haskell-ci.yml)

`turtle`'s types and idioms are reasonably complete and I don't expect there
to be significant changes to the library's core API. The only major
Expand Down
2 changes: 1 addition & 1 deletion src/Turtle/Tutorial.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1793,7 +1793,7 @@ import Turtle
-- If you have more questions or need help learning the library, ask a question
-- on Stack Overflow under the @haskell-turtle@ tag. For bugs or feature
-- requests, create an issue on Github at
-- <https://github.com/Gabriella439/Haskell-Turtle-Library/issues>
-- <https://github.com/Gabriella439/turtle/issues>
--
-- This library provides an extended suite of Unix-like utilities, but would
-- still benefit from adding more utilities for better parity with the Unix
Expand Down
6 changes: 3 additions & 3 deletions turtle.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ License-File: LICENSE
Copyright: 2015 Gabriella Gonzalez
Author: Gabriella Gonzalez
Maintainer: [email protected]
Bug-Reports: https://github.com/Gabriella439/Haskell-Turtle-Library/issues
Bug-Reports: https://github.com/Gabriella439/turtle/issues
Synopsis: Shell programming, Haskell-style
Description: @turtle@ is a reimplementation of the Unix command line environment
in Haskell so that you can use Haskell as both a shell and a scripting
Expand Down Expand Up @@ -41,7 +41,7 @@ Description: @turtle@ is a reimplementation of the Unix command line environment
Category: System

Tested-With:
GHC == 9.2.1
GHC == 9.2.5
GHC == 9.0.2
GHC == 8.10.7
GHC == 8.8.4
Expand All @@ -55,7 +55,7 @@ Extra-Source-Files:

Source-Repository head
Type: git
Location: https://github.com/Gabriella439/Haskell-Turtle-Library
Location: https://github.com/Gabriella439/turtle

Library
HS-Source-Dirs: src
Expand Down

0 comments on commit 029e0bf

Please sign in to comment.