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

Merge pull request #532 from xmonad/haskell-ci-update

Browse Source 
ci: Regenerate haskell-ci
This commit is contained in:
Tomáš Janoušek 2025-05-12 18:44:00 +02:00 committed by GitHub
commit fa8f34596d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.19.20250330 # version: 0.19.20250506
# #
# REGENDATA ("0.19.20250330",["github","cabal.project"]) # REGENDATA ("0.19.20250506",["github","cabal.project"])
# #
name: Haskell-CI name: Haskell-CI
on: on:
@ -40,9 +40,9 @@ jobs:
compilerVersion: 9.12.2 compilerVersion: 9.12.2
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-9.10.1 - compiler: ghc-9.10.2
compilerKind: ghc compilerKind: ghc
compilerVersion: 9.10.1 compilerVersion: 9.10.2
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-9.8.4 - compiler: ghc-9.8.4
@ -100,8 +100,8 @@ jobs:
chmod a+x "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup"
- name: Install cabal-install - name: Install cabal-install
run: | run: |
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV" echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup) - name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup' if: matrix.setup-method == 'ghcup'
run: | run: |

8
.github/workflows/nix.yml vendored
View File

@ -6,7 +6,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 # FIXME runs-on: ubuntu-latest
name: Nix Flake - Linux name: Nix Flake - Linux
permissions: permissions:
contents: read contents: read
@ -14,11 +14,7 @@ jobs:
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v31 uses: cachix/install-nix-action@v31
with: with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install github_access_token: ${{ secrets.GITHUB_TOKEN }}
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
extra_nix_config: |
experimental-features = nix-command flakes
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: Clone project - name: Clone project
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Build - name: Build

2
xmonad.cabal
View File

@ -27,7 +27,7 @@ author: Spencer Janssen, Don Stewart, Adam Vogt, David Roundy, Jason
Ondřej Súkup, Paul Hebble, Shachaf Ben-Kiki, Siim Põder, Tim McIver, Ondřej Súkup, Paul Hebble, Shachaf Ben-Kiki, Siim Põder, Tim McIver,
Trevor Elliott, Wouter Swierstra, Conrad Irwin, Tim Thelion, Tony Zorman Trevor Elliott, Wouter Swierstra, Conrad Irwin, Tim Thelion, Tony Zorman
maintainer: xmonad@haskell.org maintainer: xmonad@haskell.org
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.7 || == 9.8.4 || == 9.10.1 || == 9.12.2 tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.7 || == 9.8.4 || == 9.10.2 || == 9.12.2
category: System category: System
homepage: http://xmonad.org homepage: http://xmonad.org
bug-reports: https://github.com/xmonad/xmonad/issues bug-reports: https://github.com/xmonad/xmonad/issues