Skip to content

Commit 005b945

Browse files
committed
Merge branch 'axi4' of github.com:clash-lang/clash-protocols into axi4
2 parents eb91e43 + c45e0c3 commit 005b945

File tree

7 files changed

+110
-141
lines changed

7 files changed

+110
-141
lines changed

.ci/docker/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

.ci/docker/build-and-publish-docker-image.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

.ci/setup.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

.ci/test_whitespace.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
set -xou pipefail
3+
4+
grep \
5+
-E ' $' -n -r . \
6+
--include=*.{hs,hs-boot,sh,cabal,md,yml} \
7+
--exclude-dir=dist-newstyle --exclude-dir=deps
8+
if [[ $? == 0 ]]; then
9+
echo "EOL whitespace detected. See ^"
10+
exit 1;
11+
fi

.github/workflows/ci.yml

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
name: CI
2+
3+
# Trigger the workflow on all pull requests and pushes/merges to master branch
4+
on:
5+
pull_request:
6+
push:
7+
branches: [master]
8+
9+
jobs:
10+
stack:
11+
name: Stack tests
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v2
16+
17+
- name: Setup Stack / GHC
18+
uses: haskell/actions/setup@v1
19+
with:
20+
ghc-version: '8.10.7' # Exact version of ghc to use
21+
enable-stack: true
22+
stack-version: 'latest'
23+
24+
- name: Cache dependencies
25+
uses: actions/cache@v2
26+
with:
27+
path: ~/.stack
28+
key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
29+
restore-keys: |
30+
${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
31+
${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-
32+
${{ runner.os }}-ghc-${{ matrix.ghc }}-
33+
34+
# Ask Stack to use system GHC instead of installing its own copy
35+
- name: Use system GHC
36+
run: |
37+
stack config set system-ghc --global true
38+
39+
- name: Test with Stack
40+
run: |
41+
.ci/test_stack.sh
42+
43+
cabal:
44+
name: Cabal tests - ${{ matrix.os }} / ghc ${{ matrix.ghc }}
45+
runs-on: ${{ matrix.os }}
46+
strategy:
47+
matrix:
48+
os: [ubuntu-latest]
49+
cabal:
50+
- "3.2"
51+
ghc:
52+
- "8.10.7"
53+
54+
steps:
55+
- name: Checkout
56+
uses: actions/checkout@v2
57+
58+
- name: Setup Haskell
59+
uses: haskell/actions/setup@v1
60+
id: setup-haskell-cabal
61+
with:
62+
ghc-version: ${{ matrix.ghc }}
63+
cabal-version: ${{ matrix.cabal }}
64+
65+
- name: Cache dependencies
66+
uses: actions/cache@v2
67+
with:
68+
path: ~/.cabal
69+
key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
70+
restore-keys: |
71+
${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
72+
${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-
73+
${{ runner.os }}-ghc-${{ matrix.ghc }}-
74+
75+
- name: Build
76+
run: |
77+
cabal build all -fci
78+
79+
- name: Test
80+
run: |
81+
.ci/test_cabal.sh
82+
83+
- name: Documentation
84+
run: |
85+
.ci/build_docs.sh
86+
87+
linting:
88+
name: Source code linting
89+
runs-on: ubuntu-latest
90+
steps:
91+
- name: Checkout
92+
uses: actions/checkout@v2
93+
94+
- name: Whitespace
95+
run: |
96+
.ci/test_whitespace.sh

.gitlab-ci.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

stack.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2020-12-14
1+
resolver: lts-18.21 # ghc-8.10.7
22

33
packages:
44
- .
@@ -9,7 +9,8 @@ extra-deps:
99
subdirs:
1010
- hedgehog
1111
- git: https://github.com/cchalmers/circuit-notation.git
12-
commit: 0fe897cb95bd1be87abed044f4072f104dec2f7d
12+
commit: 2574640364eef12222517af059b9e4a7e6b503a7
13+
- clash-prelude-1.2.5
1314

1415
flags:
1516
clash-prelude:

0 commit comments

Comments
 (0)