From b8d446e23e44c73cb4b2bcf108d184575bb4fa30 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 c297e049fa71172b7f8fd0f014ed46f037cd8f06) (cherry picked from commit 4a867f524a6718676b39347adfce7116914d6297) (cherry picked from commit 007b9420972ffe6d5783a354e031c636711f85fe) --- 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 3592d4447e..28a02c180e 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -34,11 +34,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") }