Skip to content

Commit

Permalink
Merge branch 'axi4' of github.com:clash-lang/clash-protocols into axi4
Browse files Browse the repository at this point in the history
  • Loading branch information
PietPtr committed Jan 17, 2022
2 parents eb91e43 + c45e0c3 commit 005b945
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 141 deletions.
41 changes: 0 additions & 41 deletions .ci/docker/Dockerfile

This file was deleted.

24 changes: 0 additions & 24 deletions .ci/docker/build-and-publish-docker-image.sh

This file was deleted.

26 changes: 0 additions & 26 deletions .ci/setup.sh

This file was deleted.

11 changes: 11 additions & 0 deletions .ci/test_whitespace.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash
set -xou pipefail

grep \
-E ' $' -n -r . \
--include=*.{hs,hs-boot,sh,cabal,md,yml} \
--exclude-dir=dist-newstyle --exclude-dir=deps
if [[ $? == 0 ]]; then
echo "EOL whitespace detected. See ^"
exit 1;
fi
96 changes: 96 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: CI

# Trigger the workflow on all pull requests and pushes/merges to master branch
on:
pull_request:
push:
branches: [master]

jobs:
stack:
name: Stack tests
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Stack / GHC
uses: haskell/actions/setup@v1
with:
ghc-version: '8.10.7' # Exact version of ghc to use
enable-stack: true
stack-version: 'latest'

- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.stack
key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
restore-keys: |
${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-
${{ runner.os }}-ghc-${{ matrix.ghc }}-
# Ask Stack to use system GHC instead of installing its own copy
- name: Use system GHC
run: |
stack config set system-ghc --global true
- name: Test with Stack
run: |
.ci/test_stack.sh
cabal:
name: Cabal tests - ${{ matrix.os }} / ghc ${{ matrix.ghc }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
cabal:
- "3.2"
ghc:
- "8.10.7"

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Haskell
uses: haskell/actions/setup@v1
id: setup-haskell-cabal
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.cabal
key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
restore-keys: |
${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-
${{ runner.os }}-ghc-${{ matrix.ghc }}-
- name: Build
run: |
cabal build all -fci
- name: Test
run: |
.ci/test_cabal.sh
- name: Documentation
run: |
.ci/build_docs.sh
linting:
name: Source code linting
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Whitespace
run: |
.ci/test_whitespace.sh
48 changes: 0 additions & 48 deletions .gitlab-ci.yml

This file was deleted.

5 changes: 3 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2020-12-14
resolver: lts-18.21 # ghc-8.10.7

packages:
- .
Expand All @@ -9,7 +9,8 @@ extra-deps:
subdirs:
- hedgehog
- git: https://github.com/cchalmers/circuit-notation.git
commit: 0fe897cb95bd1be87abed044f4072f104dec2f7d
commit: 2574640364eef12222517af059b9e4a7e6b503a7
- clash-prelude-1.2.5

flags:
clash-prelude:
Expand Down

0 comments on commit 005b945

Please sign in to comment.