Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
walkowif committed Oct 20, 2023
1 parent 118d34b commit 7c9aec6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ builds:
- CGO_ENABLED=0
goos:
- linux
# - darwin
- darwin
goarch:
- amd64
# - arm64
- arm64
ldflags:
- -s -w
- -X go.szostok.io/version.version={{.Version}}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ locksmith --logLevel debug --exampleParameter 'exampleValue'
Real-life example with multiple input packages and repositories.

```bash
locksmith --inputPackageList https://raw.githubusercontent.com/insightsengineering/formatters/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/rtables/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/scda/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/scda.2022/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/nestcolor/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/tern/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/rlistings/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/citril/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/scda.test/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/citril.metadata/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/chevron/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/dunlin/main/DESCRIPTION --inputRepositoryList https://packages.roche.com/Validated-4.2/latest,https://packages.roche.com/CRAN/latest
locksmith --inputPackageList https://raw.githubusercontent.com/insightsengineering/formatters/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/rtables/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/scda/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/scda.2022/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/nestcolor/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/tern/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/rlistings/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/citril/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/scda.test/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/citril.metadata/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/chevron/main/DESCRIPTION,https://raw.githubusercontent.com/insightsengineering/dunlin/main/DESCRIPTION --inputRepositoryList https://bioconductor.org/packages/release/bioc,https://cran.rstudio.com/
```

## Configuration file
Expand Down
3 changes: 1 addition & 2 deletions cmd/construct.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,11 @@ func resolveDependenciesRecursively(outputList *[]OutputPackage, name string, ve
}
}
}
// TODO Should we fail in this case?
var versionConstraint string
if versionOperator != "" && versionValue != "" {
versionConstraint = " in version " + versionOperator + " " + versionValue
}
log.Warn(
log.Fatal(
indentation, "Could not find package ", name, versionConstraint,
" in any of the repositories.",
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func setLogLevel() {
customFormatter.ForceColors = true
log.SetFormatter(customFormatter)
log.SetReportCaller(false)
customFormatter.FullTimestamp = true
customFormatter.FullTimestamp = false
fmt.Println("logLevel =", logLevel)
switch logLevel {
case "trace":
Expand Down Expand Up @@ -82,8 +82,8 @@ in an renv.lock-compatible file.`,
fmt.Println("inputRepositoryList =", inputRepositoryList)

packageDescriptionList, repositoryList := parseInput()
log.Info("inputPackageList = ", packageDescriptionList)
log.Info("inputRepositoryList = ", repositoryList)
log.Debug("inputPackageList = ", packageDescriptionList)
log.Debug("inputRepositoryList = ", repositoryList)

inputDescriptionFiles := downloadDescriptionFiles(packageDescriptionList)
inputPackages := parseDescriptionFileList(inputDescriptionFiles)
Expand Down

0 comments on commit 7c9aec6

Please sign in to comment.