twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-18 19:10:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

ci: Move apt deps to cabal.haskell-ci and regenerate haskell-ci

Browse Source 
Related: e4659c2475
Related: https://github.com/xmonad/X11/pull/75
This commit is contained in:
Tomas Janousek 2021-05-23 18:35:34 +01:00
parent 5c40a928a1
commit 8d2d34ed6b
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
.github/workflows/haskell-ci.yml vendored
View File

@ -1,6 +1,6 @@
# This GitHub workflow config has been generated by a script via # This GitHub workflow config has been generated by a script via
# #
# haskell-ci '--apt' 'libx11-dev' '--apt' 'libxss-dev' '--apt' 'libxext-dev' '--apt' 'libxrandr-dev' 'github' 'xmonad-contrib.cabal' # haskell-ci 'github' 'cabal.project'
# #
# To regenerate the script (for example after adjusting tested-with) run # To regenerate the script (for example after adjusting tested-with) run
# #
@ -8,9 +8,9 @@
# #
# For more information, see https://github.com/haskell-CI/haskell-ci # For more information, see https://github.com/haskell-CI/haskell-ci
# #
# version: 0.11.20210111 # version: 0.12
# #
# REGENDATA ("0.11.20210111",["--apt","libx11-dev","--apt","libxss-dev","--apt","libxext-dev","--apt","libxrandr-dev","github","xmonad-contrib.cabal"]) # REGENDATA ("0.12",["github","cabal.project"])
# #
name: Haskell-CI name: Haskell-CI
on: on:
@ -18,7 +18,7 @@ on:
- pull_request - pull_request
jobs: jobs:
linux: linux:
name: Haskell-CI Linux - GHC ${{ matrix.ghc }} name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
container: container:
image: buildpack-deps:bionic image: buildpack-deps:bionic
@ -26,13 +26,13 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- ghc: 8.10.3 - compiler: ghc-8.10.3
allow-failure: false allow-failure: false
- ghc: 8.8.4 - compiler: ghc-8.8.4
allow-failure: false allow-failure: false
- ghc: 8.6.5 - compiler: ghc-8.6.5
allow-failure: false allow-failure: false
- ghc: 8.4.4 - compiler: ghc-8.4.4
allow-failure: false allow-failure: false
fail-fast: false fail-fast: false
steps: steps:
@ -42,28 +42,31 @@ jobs:
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
apt-add-repository -y 'ppa:hvr/ghc' apt-add-repository -y 'ppa:hvr/ghc'
apt-get update apt-get update
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2 libx11-dev libxext-dev libxrandr-dev libxss-dev apt-get install -y $CC cabal-install-3.4 libx11-dev libxext-dev libxft-dev libxinerama-dev libxrandr-dev libxss-dev
env: env:
GHC_VERSION: ${{ matrix.ghc }} CC: ${{ matrix.compiler }}
- name: Set PATH and environment variables - name: Set PATH and environment variables
run: | run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH echo "$HOME/.cabal/bin" >> $GITHUB_PATH
echo "LANG=C.UTF-8" >> $GITHUB_ENV echo "LANG=C.UTF-8" >> $GITHUB_ENV
echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
HC=/opt/ghc/$GHC_VERSION/bin/ghc HCDIR=$(echo "/opt/$CC" | sed 's/-/\//')
HCNAME=ghc
HC=$HCDIR/bin/$HCNAME
echo "HC=$HC" >> $GITHUB_ENV echo "HC=$HC" >> $GITHUB_ENV
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV echo "HCPKG=$HCDIR/bin/$HCNAME-pkg" >> $GITHUB_ENV
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV echo "HADDOCK=$HCDIR/bin/haddock" >> $GITHUB_ENV
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV echo "HEADHACKAGE=false" >> $GITHUB_ENV
echo "ARG_COMPILER=--$HCNAME --with-compiler=$HC" >> $GITHUB_ENV
echo "GHCJSARITH=0" >> $GITHUB_ENV echo "GHCJSARITH=0" >> $GITHUB_ENV
env: env:
GHC_VERSION: ${{ matrix.ghc }} CC: ${{ matrix.compiler }}
- name: env - name: env
run: | run: |
env env
@ -108,10 +111,14 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
path: source path: source
- name: initial cabal.project for sdist
run: |
touch cabal.project
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
cat cabal.project
- name: sdist - name: sdist
run: | run: |
mkdir -p sdist mkdir -p sdist
cd source || false
$CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
- name: unpack - name: unpack
run: | run: |
@ -138,9 +145,9 @@ jobs:
- name: cache - name: cache
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store path: ~/.cabal/store
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}- restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
- name: install dependencies - name: install dependencies
run: | run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

7
cabal.haskell-ci Normal file
View File

@ -0,0 +1,7 @@
apt:
libx11-dev
libxext-dev
libxft-dev
libxinerama-dev
libxrandr-dev
libxss-dev