From 67c5de60daa85b91fa68be4157e248fa31e75316 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 16 Sep 2024 20:18:14 +0200 Subject: Adding upstream version 256.2. Signed-off-by: Daniel Baumann --- .github/labeler.yml | 6 +++--- .github/workflows/labeler.yml | 2 +- .github/workflows/mkosi.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/labeler.yml b/.github/labeler.yml index 24ff2f0..5782c66 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -15,7 +15,7 @@ btrfs: - any-glob-to-any-file: '**/*btrfs*' build-system: - changed-files: - - any-glob-to-any-file: ['meson_options.txt', '**/meson.build', 'Makefile', 'configure'] + - any-glob-to-any-file: ['meson_options.txt', '**/meson.build'] busctl: - changed-files: - any-glob-to-any-file: '**/*busctl*' @@ -75,10 +75,10 @@ meson: - any-glob-to-any-file: ['meson_options.txt', '**/meson.build'] mkosi: - changed-files: - - any-glob-to-any-file: ['.mkosi/*', 'mkosi.build'] + - any-glob-to-any-file: '**/*mkosi*' mountfsd: - changed-files: - - any-glob-to-any-file: ['src/mountfsd/*'] + - any-glob-to-any-file: 'src/mountfsd/*' network: - changed-files: - any-glob-to-any-file: ['src/libsystemd-network/**/*', 'src/network/**/*'] diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 241b581..57e8c89 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -35,7 +35,7 @@ jobs: - name: Label PR based on policy in labeler.yml uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 - if: startsWith(github.event_name, 'pull_request') && github.event.action != 'closed' + if: startsWith(github.event_name, 'pull_request') && github.base_ref == 'main' && github.event.action != 'closed' with: repo-token: "${{ secrets.GITHUB_TOKEN }}" configuration-path: .github/labeler.yml diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 3a8dabd..1b2f77c 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -92,7 +92,7 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - uses: systemd/mkosi@6972f9efba5c8472d990be3783b7e7dbf76e109e + - uses: systemd/mkosi@70aa901697f12182ccaa24e2325867d275479b55 # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space # immediately, we remove the files in the background. However, we first move them to a different location -- cgit v1.2.3