DevFW-CICD/garm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Properly return error when checking for fallback

Browse source 
The code that attempts to fetch tools from upstream, must return the error
if the current setting is the upstream repo.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2025-09-29 09:25:54 +00:00 • committed by Gabriel
parent 3e50ee62f3
commit 22fde8d30e
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
workers/cache/gitea_tools.go vendored
View file

@ -185,14 +185,15 @@ func getTools(ctx context.Context, metadataURL string, useInternal bool) ([]comm
slog.ErrorContext(ctx, "failed to get tools from metadata URL", "error", err)
if metadataURL != appdefaults.GiteaRunnerReleasesURL {
slog.InfoContext(ctx, "attempting to get tools from default upstream", "tools_url", appdefaults.GiteaRunnerReleasesURL)
latest, err = getReleasesFromURL(ctx, metadataURL)
if err != nil {
return nil, fmt.Errorf("failed to get upstream tools: %w", err)
}
latest, err = getReleasesFromURL(ctx, appdefaults.GiteaRunnerReleasesURL)
}
}
}
if err != nil {
return nil, fmt.Errorf("failed to get tools: %w", err)
}
ret := []commonParams.RunnerApplicationDownload{}
for _, asset := range latest.Assets {