Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #296 from vania-pooh/master
Browse files Browse the repository at this point in the history
Always creating config dir
  • Loading branch information
vania-pooh authored Apr 25, 2021
2 parents fdb408c + 8cd24c0 commit 8e46bea
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v2
with:
go-version: 1.15.x
go-version: 1.16.x

- uses: actions/cache@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v2
with:
go-version: 1.15.x
go-version: 1.16.x

- uses: actions/cache@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v2
with:
go-version: 1.15.x
go-version: 1.16.x

- uses: actions/cache@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/aerokube/cm

go 1.15
go 1.16

require (
github.com/Masterminds/semver/v3 v3.0.1
Expand Down
8 changes: 4 additions & 4 deletions selenoid/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,10 @@ func (c *DockerConfigurator) IsConfigured() bool {
}

func (c *DockerConfigurator) Configure() (*SelenoidConfig, error) {
err := c.createConfigDir()
if err != nil {
return nil, fmt.Errorf("failed to create output directory: %v", err)
}
if c.BrowsersJson != "" {
return c.syncWithConfig()
}
Expand All @@ -334,10 +338,6 @@ func (c *DockerConfigurator) Configure() (*SelenoidConfig, error) {
if err != nil {
return nil, fmt.Errorf("failed to marshal json: %v", err)
}
err = c.createConfigDir()
if err != nil {
return nil, fmt.Errorf("failed to create output directory: %v", err)
}
return &cfg, ioutil.WriteFile(getSelenoidConfigPath(c.ConfigDir), data, 0644)
}

Expand Down

0 comments on commit 8e46bea

Please sign in to comment.