From c605d096816c112b321c89254894abfc45027804 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 10 May 2025 03:31:13 +0000
Subject: [PATCH 1/4] ci: Bump GHC patch versions in tested-with
---
xmonad.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xmonad.cabal b/xmonad.cabal
index 975f9b7..b650be7 100644
--- a/xmonad.cabal
+++ b/xmonad.cabal
@@ -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,
Trevor Elliott, Wouter Swierstra, Conrad Irwin, Tim Thelion, Tony Zorman
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
homepage: http://xmonad.org
bug-reports: https://github.com/xmonad/xmonad/issues
From 7a93f11bfd785aee02460c9f6f1c9d2c2b83a0d1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 10 May 2025 03:31:13 +0000
Subject: [PATCH 2/4] ci: Regenerate haskell-ci
---
.github/workflows/haskell-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index cfc11d6..a8ce49f 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
#
# 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
on:
@@ -40,9 +40,9 @@ jobs:
compilerVersion: 9.12.2
setup-method: ghcup
allow-failure: false
- - compiler: ghc-9.10.1
+ - compiler: ghc-9.10.2
compilerKind: ghc
- compilerVersion: 9.10.1
+ compilerVersion: 9.10.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.4
@@ -100,8 +100,8 @@ jobs:
chmod a+x "$HOME/.ghcup/bin/ghcup"
- name: Install cabal-install
run: |
- "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
- echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
From 8ff0fb7b525ec2d1cd653a932a202266f0a9018e Mon Sep 17 00:00:00 2001
From: Tony Zorman <mail@tony-zorman.com>
Date: Sat, 3 May 2025 08:19:05 +0200
Subject: [PATCH 3/4] ci/nix: Switch to ubuntu-latest
---
.github/workflows/nix.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 6bf74ca..61ae3c7 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -6,7 +6,7 @@ on:
jobs:
build:
- runs-on: ubuntu-20.04 # FIXME
+ runs-on: ubuntu-latest
name: Nix Flake - Linux
permissions:
contents: read
From 799b0dc1995043f6005a9556552992c5631135dc Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tomi@nomi.cz>
Date: Mon, 12 May 2025 17:21:36 +0100
Subject: [PATCH 4/4] ci/nix: Drop weird magic URLs
I don't know what these are but I hope reverting to what
cachix/install-nix-action's documentation recommends will fix the errors
we're getting with presumably old Nix on new Ubuntu GitHub Actions
runners.
---
.github/workflows/nix.yml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 61ae3c7..98421de 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -14,11 +14,7 @@ jobs:
- name: Install Nix
uses: cachix/install-nix-action@v31
with:
- install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
- 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 }}
+ github_access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Clone project
uses: actions/checkout@v4
- name: Build