From a161c5740eb5e76c13354ba2388fa34ae925fd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= Date: Tue, 30 May 2023 00:57:10 +0200 Subject: [PATCH] [CI] Search .forgejo/workflows first (cherry picked from commit 8b11cab677503be78b1deb17ed9dd5fb1c823a7d) (cherry picked from commit be5927069674a17a4c09e7f0aa530bc4630851a9) (cherry picked from commit e068f8b191585e2910d8a45ea78bfa1b78015bed) (cherry picked from commit 7855bb0c60b5ec2a972ae04e4515ee5adb19a5e7) (cherry picked from commit 45c4c8f44383dced75ab83f7c817b52e78968fab) (cherry picked from commit 89520d67ffe0062e1accd39763e1e7dd5058d83a) (cherry picked from commit 15eeb417a4b8bb948f888c73e20135c1e0fd1f63) (cherry picked from commit 6db53a26432f02ae50da948483e2010bd962f9ce) (cherry picked from commit 2f689b321fa275b6412f0b8686edc7aba97c3565) (cherry picked from commit 04dc478314c3b4927cca78c354ca46ee217f035a) (cherry picked from commit a554624f40f51c1c75d754d6cca14f7626bb599e) (cherry picked from commit abca05f0d1c29680bba897cc0de7037053915ced) (cherry picked from commit dc13e7eb22f2bde817f3845c646574d8f39c1b18) --- modules/actions/workflows.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 408fdb8f8e..c49cf3193a 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -40,11 +40,14 @@ func IsWorkflow(path string) bool { return false } - return strings.HasPrefix(path, ".gitea/workflows") || strings.HasPrefix(path, ".github/workflows") + return strings.HasPrefix(path, ".forgejo/workflows") || strings.HasPrefix(path, ".gitea/workflows") || strings.HasPrefix(path, ".github/workflows") } func ListWorkflows(commit *git.Commit) (git.Entries, error) { - tree, err := commit.SubTree(".gitea/workflows") + tree, err := commit.SubTree(".forgejo/workflows") + if _, ok := err.(git.ErrNotExist); ok { + tree, err = commit.SubTree(".gitea/workflows") + } if _, ok := err.(git.ErrNotExist); ok { tree, err = commit.SubTree(".github/workflows") }