Unverified Commit 155474ca authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge e09a2cad into haskell-updates

parents b3ec670a e09a2cad

.github/labeler.yml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
    - changed-files:

      - any-glob-to-any-file:

        - .github/**/*

        - ci/**/*

        - ci/**/*.*



"6.topic: coq":

  - any:

.github/workflows/backport.yml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ jobs: 
  backport:

    name: Backport Pull Request

    if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport'))

    runs-on: ubuntu-24.04

    runs-on: ubuntu-24.04-arm

    steps:

      # Use a GitHub App to create the PR so that CI gets triggered

      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs

.github/workflows/check-cherry-picks.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ permissions: {} 
jobs:

  check:

    name: cherry-pick-check

    runs-on: ubuntu-24.04

    runs-on: ubuntu-24.04-arm

    if: github.repository_owner == 'NixOS'

    steps:

      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/check-format.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ jobs: 


  nixos:

    name: fmt-check

    runs-on: ubuntu-24.04

    runs-on: ubuntu-24.04-arm

    needs: get-merge-commit

    if: needs.get-merge-commit.outputs.mergedSha

    steps:

.github/workflows/check-shell.yml

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ jobs: 
        include:

          - runner: ubuntu-24.04

            system: x86_64-linux

          - runner: ubuntu-24.04-arm

            system: aarch64-linux

          - runner: macos-13

            system: x86_64-darwin

          - runner: macos-14

            system: aarch64-darwin
@@ -30,4 +34,4 @@ jobs: 
      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31



      - name: Build shell

        run: nix-build shell.nix
 
        run: nix-build ci -A shell