Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-27 02:52:14 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix ansible-semaphore/semaphore#682

Browse Source
This commit is contained in:
Cyril 2022-03-17 17:18:56 +01:00
parent 6d8a8b6763
commit de3b1e2eb5
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
services/tasks/runner.go
View File

@ -483,20 +483,49 @@ func (t *TaskRunner) updateRepository() error {
return repo.Clone()
}
func (t *TaskRunner) installRequirements() error {
requirementsFilePath := fmt.Sprintf("%s/roles/requirements.yml", t.getRepoPath())
requirementsHashFilePath := fmt.Sprintf("%s/requirements.md5", t.getRepoPath())
func (t *TaskRunner) installCollectionsRequirements() error {
requirementsFilePath := fmt.Sprintf("%s/collections/requirements.yml", t.getRepoPath())
requirementsHashFilePath := fmt.Sprintf("%s.md5", requirementsFilePath)
if _, err := os.Stat(requirementsFilePath); err != nil {
t.Log("No collections/requirements.yml file found. Skip galaxy install process.\n")
return nil
}
if hasRequirementsChanges(requirementsFilePath, requirementsHashFilePath) {
if err := t.runGalaxy([]string{
"collections",
"install",
"-r",
requirementsFilePath,
"--force",
}); err != nil {
return err
}
if err := writeMD5Hash(requirementsFilePath, requirementsHashFilePath); err != nil {
return err
}
} else {
t.Log("collections/requirements.yml has no changes. Skip galaxy install process.\n")
}
return nil
}
func (t *TaskRunner) installRolesRequirements() error {
requirementsFilePath := fmt.Sprintf("%s/roles/requirements.yml", t.getRepoPath())
requirementsHashFilePath := fmt.Sprintf("%s.md5", requirementsFilePath)
if _, err := os.Stat(requirementsFilePath); err != nil {
t.Log("No roles/requirements.yml file found. Skip galaxy install process.\n")
return nil
}
if hasRequirementsChanges(requirementsFilePath, requirementsHashFilePath) {
if err := t.runGalaxy([]string{
"install",
"-r",
"roles/requirements.yml",
requirementsFilePath,
"--force",
}); err != nil {
return err
@ -507,7 +536,17 @@ func (t *TaskRunner) installRequirements() error {
} else {
t.Log("roles/requirements.yml has no changes. Skip galaxy install process.\n")
}
return nil
}
func (t *TaskRunner) installRequirements() error {
if err := t.installCollectionsRequirements(); err != nil {
return err
}
if err := t.installRolesRequirements(); err != nil {
return err
}
return nil
}