From a27723a10188a9ebb042eaf21ebac1bd976c7576 Mon Sep 17 00:00:00 2001 From: Lord_Cambion Date: Sat, 28 Mar 2026 11:15:57 +0100 Subject: [PATCH] gitea changed idk why --- .gitea/workflows/nightly.yml | 15 +++++++++++---- .gitea/workflows/nightly.yml.rej | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 .gitea/workflows/nightly.yml.rej diff --git a/.gitea/workflows/nightly.yml b/.gitea/workflows/nightly.yml index 1805d5d6..ce3b0d3f 100644 --- a/.gitea/workflows/nightly.yml +++ b/.gitea/workflows/nightly.yml @@ -4,12 +4,15 @@ on: workflow_dispatch: push: branches: - - main + - 'main' paths-ignore: - '.gitignore' - '*.md' - - '.forgejo/**' - - '!.forgejo/workflows/nightly.yml' + - '.gitea/**' + - '!.gitea/workflows/nightly.yml' + +permissions: + contents: write concurrency: group: nightly @@ -32,7 +35,11 @@ jobs: - name: Cache Nix store uses: https://code.forgejo.org/actions/cache@v4 with: - path: ~/.cache/nix + path: | + ~/.cache/nix + /nix/store + /nix/var/nix/db + /nix/var/nix/gcroots key: nix-${{ runner.os }}-${{ hashFiles('flake.lock') }} restore-keys: | nix-${{ runner.os }}- diff --git a/.gitea/workflows/nightly.yml.rej b/.gitea/workflows/nightly.yml.rej new file mode 100644 index 00000000..2bbce43e --- /dev/null +++ b/.gitea/workflows/nightly.yml.rej @@ -0,0 +1,20 @@ +diff a/.gitea/workflows/nightly.yml b/.gitea/workflows/nightly.yml (rejected hunks) +@@ -4,15 +4,12 @@ + workflow_dispatch: + push: + branches: +- - 'main' ++ - main + paths-ignore: + - '.gitignore' + - '*.md' +- - '.gitea/**' +- - '!.gitea/workflows/nightly.yml' +- +-permissions: +- contents: write ++ - '.forgejo/**' ++ - '!.forgejo/workflows/nightly.yml' + + concurrency: + group: nightly