Skip to content

Commit

Permalink
fix(be): ignore max parallel tasks if it is 0
Browse files Browse the repository at this point in the history
  • Loading branch information
fiftin committed Sep 17, 2023
1 parent cb2bcd8 commit e6c72fb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion services/tasks/TaskPool.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (p *TaskPool) Run() {

func (p *TaskPool) blocks(t *TaskRunner) bool {

if len(p.runningTasks) >= util.Config.MaxParallelTasks {
if util.Config.MaxParallelTasks > 0 && len(p.runningTasks) >= util.Config.MaxParallelTasks {
return true
}

Expand Down
12 changes: 6 additions & 6 deletions web/src/lang/pt.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ export default {
gitUrl: 'URL Git',
sshKey: 'Chave SSH',
lastTask: 'Última Tarefa',
task2: 'Tarefa',
build: 'Compilar',
deploy: 'Implementar',
// task2: 'Tarefa',
// build: 'Compilar',
// deploy: 'Implementar',
run: 'Executar',
add: 'Adicionar',
password_required: 'Palavra-passe obrigatória',
Expand All @@ -227,8 +227,8 @@ export default {
environment_required: 'Ambiente obrigatório',
email_required: 'E-mail obrigatório',
build_template_required: 'Modelo de compilação obrigatório',
Task: 'Tarefa',
Build: 'Compilar',
Deploy: 'Implementar',
// Task: 'Tarefa',
// Build: 'Compilar',
// Deploy: 'Implementar',
Run: 'Executar',
};
1 change: 1 addition & 0 deletions web/src/views/project/History.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
:to="`/project/${projectId}/settings`"
>{{ $t('settings') }}
</v-tab>
<v-tab key="history" :to="`/project/${projectId}/billing`">{{ $t('billing') }}</v-tab>
</v-tabs>

<v-data-table
Expand Down

0 comments on commit e6c72fb

Please sign in to comment.