studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 64 Pull Requests 5 Releases Wiki Activity

WIP: 103268-job-task-progress #104185

Draft
Nitin-Rawat-1 wants to merge 19 commits from Nitin-Rawat-1/flamenco:103268-job-task-progress into main
pull from: Nitin-Rawat-1/flamenco:103268-job-task-progress
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 19 Files Changed 30 +4 -2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 175839729c - Show all commits

2
internal/manager/config/config.go
View File

@ -28,7 +28,7 @@ import (
// configFilename is used to specify where flamenco will write its config file. // configFilename is used to specify where flamenco will write its config file.
// If the path is not absolute, it will use the flamenco binary location as the // If the path is not absolute, it will use the flamenco binary location as the
// relative root path. This is not intended to be changed during runtime. // relative root path. This is not intended to be changed during runtime.
var configFilename = "flamenco-manager.yaml" var configFilename = "flamenco-manager.yaml"
const ( const (
latestConfigVersion = 3 latestConfigVersion = 3

3
internal/worker/command_exe.go
View File

@ -49,8 +49,9 @@ type TimeService interface {
Now() time.Time Now() time.Time
} }
//go:generate go run github.com/golang/mock/mockgen -destination mocks/cli_runner.gen.go -package mocks git.blender.org/flamenco/internal/worker CommandLineRunner
// CommandLineRunner is an interface around exec.CommandContext(). // CommandLineRunner is an interface around exec.CommandContext().
//
//go:generate go run github.com/golang/mock/mockgen -destination mocks/cli_runner.gen.go -package mocks git.blender.org/flamenco/internal/worker CommandLineRunner
Sybren A. Stüvel commented 2023-03-10 11:13:29 +01:00
Outdated
Review
Copy Link

Try to keep the changes in a PR to a minimum. Unless there is a good reason, keep the ordering of these comments the same. That'll make it easier to see what actually changed.

Try to keep the changes in a PR to a minimum. Unless there is a good reason, keep the ordering of these comments the same. That'll make it easier to see what actually changed.
type CommandLineRunner interface { type CommandLineRunner interface {
CommandContext(ctx context.Context, name string, arg ...string) *exec.Cmd CommandContext(ctx context.Context, name string, arg ...string) *exec.Cmd
RunWithTextOutput( RunWithTextOutput(

1
pkg/shaman/touch/touch_nonlinux.go
View File

@ -1,3 +1,4 @@
//go:build !linux
// +build !linux // +build !linux
/* (c) 2019, Blender Foundation /* (c) 2019, Blender Foundation