Skip to content

Commit 93fe466

Browse files
andreasabelBodigrim
andreasabel
authored and
Bodigrim
committed
Revert "CI: temporarily disable some workflows"
This reverts commit e530dcb.
1 parent a735ac0 commit 93fe466

File tree

2 files changed

+116
-116
lines changed

2 files changed

+116
-116
lines changed

‎.github/workflows/ci-wasm32-wasi.yml-off renamed to ‎.github/workflows/ci-wasm32-wasi.yml

File renamed without changes.

‎.github/workflows/ci.yml

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: ci
22
on:
3-
push: { branches: [master] }
4-
pull_request: { branches: [master] }
3+
push:
4+
pull_request:
55
schedule:
66
- cron: 0 0 * * *
77

@@ -10,56 +10,56 @@ defaults:
1010
shell: bash
1111

1212
jobs:
13-
# build:
14-
# runs-on: ${{ matrix.os }}
15-
# strategy:
16-
# fail-fast: true
17-
# matrix:
18-
# os: [ubuntu-24.04, macOS-latest]
19-
# ghc: ['9.10', '9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
20-
# exclude:
21-
# - os: macos-latest
22-
# ghc: '9.0'
23-
# - os: macos-latest
24-
# ghc: '8.10'
25-
# - os: macos-latest
26-
# ghc: '8.8'
27-
# - os: macos-latest
28-
# ghc: '8.6'
29-
# steps:
30-
# - uses: actions/checkout@v4
31-
# - name: Setup toolchain
32-
# run: |
33-
# curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
13+
build:
14+
runs-on: ${{ matrix.os }}
15+
strategy:
16+
fail-fast: true
17+
matrix:
18+
os: [ubuntu-24.04, macOS-latest]
19+
ghc: ['9.10', '9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
20+
exclude:
21+
- os: macos-latest
22+
ghc: '9.0'
23+
- os: macos-latest
24+
ghc: '8.10'
25+
- os: macos-latest
26+
ghc: '8.8'
27+
- os: macos-latest
28+
ghc: '8.6'
29+
steps:
30+
- uses: actions/checkout@v4
31+
- name: Setup toolchain
32+
run: |
33+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
3434
35-
# - if: runner.os == 'macOS'
36-
# name: Install system deps via brew
37-
# run: brew install coreutils autoconf automake
35+
- if: runner.os == 'macOS'
36+
name: Install system deps via brew
37+
run: brew install coreutils autoconf automake
3838

39-
# - uses: actions/cache@v4
40-
# name: Cache cabal stuff
41-
# with:
42-
# path: |
43-
# ~/.cabal/store
44-
# dist-newstyle
45-
# key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
46-
# restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
47-
# - name: Build
48-
# run: |
49-
# . ~/.ghcup/env
50-
# ghc --version
51-
# cabal --version
52-
# cabal update
53-
# autoreconf --version
54-
# autoreconf -i
55-
# cabal sdist -z -o .
56-
# cabal get unix-*.tar.gz
57-
# cd unix-*/
58-
# cabal test all --test-show-details=direct
59-
# - name: Haddock
60-
# run: |
61-
# . ~/.ghcup/env
62-
# cabal haddock --disable-documentation
39+
- uses: actions/cache@v4
40+
name: Cache cabal stuff
41+
with:
42+
path: |
43+
~/.cabal/store
44+
dist-newstyle
45+
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
46+
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
47+
- name: Build
48+
run: |
49+
. ~/.ghcup/env
50+
ghc --version
51+
cabal --version
52+
cabal update
53+
autoreconf --version
54+
autoreconf -i
55+
cabal sdist -z -o .
56+
cabal get unix-*.tar.gz
57+
cd unix-*/
58+
cabal test all --test-show-details=direct
59+
- name: Haddock
60+
run: |
61+
. ~/.ghcup/env
62+
cabal haddock --disable-documentation
6363
6464
redhat-ubi9:
6565
runs-on: ubuntu-24.04
@@ -80,25 +80,25 @@ jobs:
8080
autoreconf -i
8181
cabal test all --test-show-details=direct
8282
83-
# fedora37:
84-
# runs-on: ubuntu-latest
85-
# container:
86-
# image: fedora:37
87-
# steps:
88-
# - name: Install
89-
# run: |
90-
# dnf install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl autoconf
91-
# curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
92-
# - uses: actions/checkout@v4
93-
# - name: Test
94-
# run: |
95-
# source ~/.ghcup/env
96-
# cabal --version
97-
# cabal update
98-
# autoreconf --version
99-
# autoreconf -i
100-
# # test filepath >= 1.5
101-
# cabal test --constraint='filepath >= 1.5.0.0' all --test-show-details=direct
83+
fedora37:
84+
runs-on: ubuntu-latest
85+
container:
86+
image: fedora:37
87+
steps:
88+
- name: Install
89+
run: |
90+
dnf install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl autoconf
91+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
92+
- uses: actions/checkout@v4
93+
- name: Test
94+
run: |
95+
source ~/.ghcup/env
96+
cabal --version
97+
cabal update
98+
autoreconf --version
99+
autoreconf -i
100+
# test filepath >= 1.5
101+
cabal test --constraint='filepath >= 1.5.0.0' all --test-show-details=direct
102102
103103
i386:
104104
runs-on: ubuntu-latest
@@ -120,55 +120,55 @@ jobs:
120120
autoreconf -i
121121
cabal v2-test --constraint 'optparse-applicative -process' --constraint 'QuickCheck +old-random' --constraint 'tasty -unix' all
122122
123-
# arm:
124-
# runs-on: [self-hosted, Linux, ARM64]
125-
# strategy:
126-
# fail-fast: false
127-
# matrix:
128-
# arch: [arm32v7, arm64v8]
129-
# steps:
130-
# - uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
131-
# name: Cleanup
132-
# with:
133-
# args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
123+
arm:
124+
runs-on: [self-hosted, Linux, ARM64]
125+
strategy:
126+
fail-fast: false
127+
matrix:
128+
arch: [arm32v7, arm64v8]
129+
steps:
130+
- uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
131+
name: Cleanup
132+
with:
133+
args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
134134

135-
# - name: Checkout code
136-
# uses: actions/checkout@v4
135+
- name: Checkout code
136+
uses: actions/checkout@v4
137137

138-
# - if: matrix.arch == 'arm32v7'
139-
# uses: docker://hasufell/arm32v7-ubuntu-haskell:focal
140-
# name: Run build (arm32v7 linux)
141-
# with:
142-
# args: sh -c "cabal update && autoreconf -i && cabal test all --test-show-details=direct"
138+
- if: matrix.arch == 'arm32v7'
139+
uses: docker://hasufell/arm32v7-ubuntu-haskell:focal
140+
name: Run build (arm32v7 linux)
141+
with:
142+
args: sh -c "cabal update && autoreconf -i && cabal test all --test-show-details=direct"
143143

144-
# - if: matrix.arch == 'arm64v8'
145-
# uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
146-
# name: Run build (arm64v8 linux)
147-
# with:
148-
# args: sh -c "cabal update && autoreconf -i && cabal test all --test-show-details=direct"
144+
- if: matrix.arch == 'arm64v8'
145+
uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
146+
name: Run build (arm64v8 linux)
147+
with:
148+
args: sh -c "cabal update && autoreconf -i && cabal test all --test-show-details=direct"
149149

150-
# freebsd:
151-
# runs-on: ${{ matrix.os }}
152-
# strategy:
153-
# fail-fast: false
154-
# matrix:
155-
# include:
156-
# - os: [self-hosted, FreeBSD, X64]
157-
# ghc: 9.4
158-
# - os: [self-hosted, FreeBSD, X64]
159-
# ghc: 9.6
160-
# steps:
161-
# - name: Checkout code
162-
# uses: actions/checkout@v4
150+
freebsd:
151+
runs-on: ${{ matrix.os }}
152+
strategy:
153+
fail-fast: false
154+
matrix:
155+
include:
156+
- os: [self-hosted, FreeBSD, X64]
157+
ghc: 9.4
158+
- os: [self-hosted, FreeBSD, X64]
159+
ghc: 9.6
160+
steps:
161+
- name: Checkout code
162+
uses: actions/checkout@v4
163163

164-
# - name: Run build
165-
# run: |
166-
# pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake autoconf
167-
# . .github/scripts/env.sh
168-
# curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
169-
# autoreconf --version
170-
# autoreconf -i
171-
# cabal sdist -z -o .
172-
# cabal get unix-*.tar.gz
173-
# cd unix-*/
174-
# cabal test all --test-show-details=direct
164+
- name: Run build
165+
run: |
166+
pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake autoconf
167+
. .github/scripts/env.sh
168+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
169+
autoreconf --version
170+
autoreconf -i
171+
cabal sdist -z -o .
172+
cabal get unix-*.tar.gz
173+
cd unix-*/
174+
cabal test all --test-show-details=direct

0 commit comments

Comments
 (0)