fix: use new repo name
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
b5f23d3791
commit
0557284461
|
@ -20,40 +20,40 @@ import (
|
||||||
|
|
||||||
// CatalogueSkipList is all the repos that are not recipes.
|
// CatalogueSkipList is all the repos that are not recipes.
|
||||||
var CatalogueSkipList = map[string]bool{
|
var CatalogueSkipList = map[string]bool{
|
||||||
"abra": true,
|
"abra": true,
|
||||||
"abra-apps": true,
|
"abra-apps": true,
|
||||||
"abra-aur": true,
|
"abra-aur": true,
|
||||||
"abra-bash": true,
|
"abra-bash": true,
|
||||||
"abra-capsul": true,
|
"abra-capsul": true,
|
||||||
"abra-gandi": true,
|
"abra-gandi": true,
|
||||||
"abra-hetzner": true,
|
"abra-hetzner": true,
|
||||||
"apps": true,
|
"apps": true,
|
||||||
"aur-abra-git": true,
|
"aur-abra-git": true,
|
||||||
"auto-apps-json": true,
|
"auto-apps-json": true,
|
||||||
"auto-mirror": true,
|
"auto-mirror": true,
|
||||||
"backup-bot": true,
|
"backup-bot": true,
|
||||||
"backup-bot-two": true,
|
"backup-bot-two": true,
|
||||||
"beta.coopcloud.tech": true,
|
"beta.coopcloud.tech": true,
|
||||||
"comrade-renovate-bot": true,
|
"comrade-renovate-bot": true,
|
||||||
"coopcloud.tech": true,
|
"coopcloud.tech": true,
|
||||||
"coturn": true,
|
"coturn": true,
|
||||||
"docker-cp-deploy": true,
|
"docker-cp-deploy": true,
|
||||||
"docker-dind-bats-kcov": true,
|
"docker-dind-bats-kcov": true,
|
||||||
"docs.coopcloud.tech": true,
|
"docs.coopcloud.tech": true,
|
||||||
"drone-abra": true,
|
"drone-abra": true,
|
||||||
"example": true,
|
"example": true,
|
||||||
"gardening": true,
|
"gardening": true,
|
||||||
"go-abra": true,
|
"go-abra": true,
|
||||||
"organising": true,
|
"organising": true,
|
||||||
"outline-with-patch": true,
|
"outline-with-patch": true,
|
||||||
"pyabra": true,
|
"pyabra": true,
|
||||||
"radicle-seed-node": true,
|
"radicle-seed-node": true,
|
||||||
"recipes": true,
|
"recipes-catalogue-json": true,
|
||||||
"stack-ssh-deploy": true,
|
"stack-ssh-deploy": true,
|
||||||
"swarm-cronjob": true,
|
"swarm-cronjob": true,
|
||||||
"tagcmp": true,
|
"tagcmp": true,
|
||||||
"traefik-cert-dumper": true,
|
"traefik-cert-dumper": true,
|
||||||
"tyop": true,
|
"tyop": true,
|
||||||
}
|
}
|
||||||
|
|
||||||
var catalogueGenerateCommand = cli.Command{
|
var catalogueGenerateCommand = cli.Command{
|
||||||
|
@ -215,7 +215,7 @@ keys configured on your account.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, "recipes")
|
sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
|
||||||
if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
|
if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -236,7 +236,7 @@ keys configured on your account.
|
||||||
}
|
}
|
||||||
|
|
||||||
if !internal.Dry && internal.Publish {
|
if !internal.Dry && internal.Publish {
|
||||||
url := fmt.Sprintf("%s/recipes/commit/%s", config.REPOS_BASE_URL, head.Hash())
|
url := fmt.Sprintf("%s/%s/commit/%s", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME, head.Hash())
|
||||||
logrus.Infof("new changes published: %s", url)
|
logrus.Infof("new changes published: %s", url)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ var RECIPES_DIR = path.Join(ABRA_DIR, "recipes")
|
||||||
var VENDOR_DIR = path.Join(ABRA_DIR, "vendor")
|
var VENDOR_DIR = path.Join(ABRA_DIR, "vendor")
|
||||||
var RECIPES_JSON = path.Join(ABRA_DIR, "catalogue", "recipes.json")
|
var RECIPES_JSON = path.Join(ABRA_DIR, "catalogue", "recipes.json")
|
||||||
var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud"
|
var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud"
|
||||||
|
var CATALOGUE_JSON_REPO_NAME = "recipes-catalogue-json"
|
||||||
var SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
|
var SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
|
||||||
|
|
||||||
// GetServers retrieves all servers.
|
// GetServers retrieves all servers.
|
||||||
|
|
|
@ -1054,7 +1054,7 @@ func GetRecipeCatalogueVersions(recipeName string, catl RecipeCatalogue) ([]stri
|
||||||
func EnsureCatalogue() error {
|
func EnsureCatalogue() error {
|
||||||
catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
|
catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
|
||||||
if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
|
if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
|
||||||
url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "recipes")
|
url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME)
|
||||||
if err := gitPkg.Clone(catalogueDir, url); err != nil {
|
if err := gitPkg.Clone(catalogueDir, url); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue