From be2de105f5bf55132f19c6a219a8297d4f3cfc64 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) (cherry picked from commit a161c5740eb5e76c13354ba2388fa34ae925fd8b) (cherry picked from commit 06d33e2773f01b576ba050afe2b88718a7999434) (cherry picked from commit f536275161cc4bf5d2f163bd68a4c4498c9fff3d) (cherry picked from commit 84ac6f314a1840d45bdecb2ccd4482fb925fd2c2) (cherry picked from commit 1e8126edfc3a6c78cda35f053bd0ac40ba9874ef) (cherry picked from commit 0287ac3416563e0af05c3aeabc338b791c74ddb2) (cherry picked from commit 3e5fca2aaea299013691f102b10417ac33988df0) (cherry picked from commit 03b220bfeb86caa82eec2a67caf9a08460cf76c0) (cherry picked from commit 1d033f4aaf2b7db1ae98e91d96ef3b8a0b07539e) (cherry picked from commit 2ee9e3e9a395357885f16fa8a22a24cda79f637f) (cherry picked from commit d28c2849931e7de2ae1660513774047bf6868e1a) (cherry picked from commit 239df83859f88f7833f5796ee1f0811732c6e9a2) (cherry picked from commit 96ae0c2e5d4fafbead44db52297e21242da0a6d0) (cherry picked from commit 49aef71b322395674a5360bac7b93561e773ea35) (cherry picked from commit 38b56d108d3f27faa0dc191518e6dbcb775fd7bf) (cherry picked from commit 30f8d9ec3adecf4025fc3547e9a745d700f68d83) (cherry picked from commit d5318618509f5d8bdef999445357553ab1c4cb5c) (cherry picked from commit a75707deaa52cd3fedfda766460bcc8f2d7dea92) (cherry picked from commit b1c73918b2ddaa4a59d9e7405b3b5bea5ccd496a) (cherry picked from commit 53919170919bfcd3dca00ecbeb0778eadb0af075) (cherry picked from commit a427f8dae539e9b38b8ca0e86ebb09cc2940e5a7) (cherry picked from commit 6ba6f62c7e696b6975fbd797b1c596ff28c64e91) --- 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 a883f4181b..382338c957 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") }