diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index d887d97..eaf21f1 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -4,6 +4,7 @@ name: REUSE Compliance Check on: + workflow_call: pull_request: push: branches: diff --git a/patches/nextcloud/reuse.yml.patch b/patches/nextcloud/reuse.yml.patch index 61da1b0..8b01f84 100644 --- a/patches/nextcloud/reuse.yml.patch +++ b/patches/nextcloud/reuse.yml.patch @@ -1,23 +1,58 @@ --- upstream/vendor/nextcloud/reuse.yml -+++ upstream/vendor/nextcloud/reuse.yml -@@ -1,7 +1,9 @@ ++++ .github/workflows/reuse.yml +@@ -1,27 +1,28 @@ -# This workflow is provided via the organization template repository -+# This workflow is maintained by LibreCodeCoop/github-workflows and published -+# through the LibreCodeCoop organization workflow catalog. -+# Managed by LibreCode workflow synchronization; local edits are treated as divergence. - # +-# -# https://github.com/nextcloud/.github -+# https://github.com/LibreCodeCoop/github-workflows - # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization - - # SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. - # -@@ -16,7 +18,7 @@ - - jobs: - reuse-compliance-check: +-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization +- +-# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. +-# +-# SPDX-License-Identifier: CC0-1.0 +- +-name: REUSE Compliance Check +- +-on: [pull_request] +- +-permissions: +- contents: read +- +-jobs: +- reuse-compliance-check: - runs-on: ubuntu-latest-low +- steps: +- - name: Checkout +- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 +- with: +- persist-credentials: false +- +- - name: REUSE Compliance Check +- uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6.0.0 ++# SPDX-FileCopyrightText: 2026 LibreCode coop and contributors ++# SPDX-License-Identifier: AGPL-3.0-or-later ++ ++name: REUSE Compliance Check ++ ++on: ++ workflow_call: ++ pull_request: ++ push: ++ branches: ++ - main ++ ++permissions: ++ contents: read ++ ++jobs: ++ reuse: ++ name: REUSE Compliance Check + runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 ++ timeout-minutes: 10 ++ steps: ++ - name: Checkout ++ uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 ++ with: ++ persist-credentials: false ++ ++ - name: Run REUSE ++ uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6.0.0 diff --git a/upstream/templates.json b/upstream/templates.json index 19beed2..f088114 100644 --- a/upstream/templates.json +++ b/upstream/templates.json @@ -102,7 +102,7 @@ "patches": [ "patches/nextcloud/reuse.yml.patch" ], - "destination": "workflow-templates/reuse.yml" + "destination": ".github/workflows/reuse.yml" } ] } diff --git a/workflow-templates/reuse.yml b/workflow-templates/reuse.yml index e652788..2f96be6 100644 --- a/workflow-templates/reuse.yml +++ b/workflow-templates/reuse.yml @@ -1,29 +1,16 @@ -# This workflow is maintained by LibreCodeCoop/github-workflows and published -# through the LibreCodeCoop organization workflow catalog. -# Managed by LibreCode workflow synchronization; local edits are treated as divergence. -# -# https://github.com/LibreCodeCoop/github-workflows -# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization +# SPDX-FileCopyrightText: 2026 LibreCode coop and contributors +# SPDX-License-Identifier: AGPL-3.0-or-later -# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. -# -# SPDX-License-Identifier: CC0-1.0 +# This workflow is published through the LibreCode organization catalog. +# Implementation: LibreCodeCoop/github-workflows name: REUSE Compliance Check -on: [pull_request] +on: pull_request permissions: contents: read jobs: - reuse-compliance-check: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - - name: REUSE Compliance Check - uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6.0.0 + reuse: + uses: LibreCodeCoop/github-workflows/.github/workflows/reuse.yml@5c8e231dae8e4fa1764fe84b552c48f45b6d39e8