Compare commits

..

No commits in common. "main" and "v1.3.0" have entirely different histories.
main ... v1.3.0

3 changed files with 21 additions and 45 deletions

View File

@ -1,9 +0,0 @@
kind: pipeline
type: docker
name: "test"
steps:
- name: test
image: harbor.front.kjuulh.io/docker-proxy/library/bash:latest
commands:
- echo 'Run tests'

View File

@ -4,7 +4,6 @@ import (
"context" "context"
"os" "os"
"sync" "sync"
"time"
) )
const ( const (
@ -34,34 +33,28 @@ func NewManager() *Manager {
type ComponentsAreReady struct { type ComponentsAreReady struct {
} }
type CleanupFunc func(ctx context.Context) error func (m *Manager) RunNonBlocking(ctx context.Context) error {
m.initLifetime()
err := m.init(ctx)
if err != nil {
return err
}
func (m *Manager) RunNonBlocking(ctx context.Context, readyChan chan ComponentsAreReady) (CleanupFunc, error) { err = m.startBlocking(ctx)
go func() error { if err != nil {
m.initLifetime() return err
err := m.init(ctx) }
if err != nil {
return err
}
err = m.startBlocking(ctx) err = m.wait(ctx)
if err != nil { if err != nil {
return err return err
} }
readyChan <- ComponentsAreReady{} err = m.shutdown(ctx)
if err != nil {
err = m.wait(ctx) return err
if err != nil { }
return err return nil
}
return nil
}()
return func(ctx context.Context) error {
return m.shutdown(ctx)
}, nil
} }
func (m *Manager) Run(ctx context.Context) error { func (m *Manager) Run(ctx context.Context) error {
@ -164,13 +157,8 @@ func (m *Manager) initLifetime() {
} }
func (m *Manager) wait(ctx context.Context) error { func (m *Manager) wait(ctx context.Context) error {
select { exitCode := <-m.exitChan
case exitCode := <-m.exitChan: m.exitCode = exitCode
m.exitCode = exitCode
return nil
case <-ctx.Done():
return nil
}
return nil return nil
} }

View File

@ -1,3 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
}