Commit 3029205c authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 7e259cee ab36ef17
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -171,11 +171,11 @@ jobs:
        run: |
          # Get the latest eval.yml workflow run for the PR's target commit
          if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \
            -f head_sha="$BASE_SHA" -f event=push \
            -f head_sha="$TARGET_SHA" -f event=push \
            --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \
            || [[ -z "$run" ]]; then
            echo "Could not find an eval.yml workflow run for $BASE_SHA, cannot make comparison"
            exit 0
            echo "Could not find an eval.yml workflow run for $TARGET_SHA, cannot make comparison"
            exit 1
          fi
          echo "Comparing against $(jq .html_url <<< "$run")"
          runId=$(jq .id <<< "$run")
@@ -189,13 +189,13 @@ jobs:

          if [[ "$conclusion" != "success" ]]; then
            echo "Workflow was not successful (conclusion: $conclusion), cannot make comparison"
            exit 0
            exit 1
          fi

          echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"
        env:
          REPOSITORY: ${{ github.repository }}
          BASE_SHA: ${{ needs.attrs.outputs.targetSha }}
          TARGET_SHA: ${{ needs.attrs.outputs.targetSha }}
          GH_TOKEN: ${{ github.token }}

      - uses: actions/download-artifact@v4
+6 −0
Original line number Diff line number Diff line
@@ -5974,6 +5974,12 @@
    githubId = 523628;
    name = "Jonathan Strickland";
  };
  djds = {
    email = "git@djds.dev";
    github = "djds";
    githubId = 4218822;
    name = "djds";
  };
  Dje4321 = {
    email = "dje4321@gmail.com";
    github = "dje4321";
+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@

- [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable)

- [GLPI-Agent](https://github.com/glpi-project/glpi-agent), GLPI Agent. Available as [services.glpiAgent](options.html#opt-services.glpiAgent.enable).

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
+1 −0
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@
  ./services/monitoring/gatus.nix
  ./services/monitoring/gitwatch.nix
  ./services/monitoring/glances.nix
  ./services/monitoring/glpi-agent.nix
  ./services/monitoring/goss.nix
  ./services/monitoring/grafana-agent.nix
  ./services/monitoring/grafana-image-renderer.nix
+1 −4
Original line number Diff line number Diff line
@@ -126,11 +126,8 @@ let
        network = lib.mkOption {
          type = lib.types.nullOr (
            lib.types.enum [
              "goerli"
              "holesky"
              "rinkeby"
              "yolov2"
              "ropsten"
              "sepolia"
            ]
          );
          default = null;
Loading