diff --git a/development/manage-version.yaml b/development/manage-version.yaml index e647c11..ce00c78 100644 --- a/development/manage-version.yaml +++ b/development/manage-version.yaml @@ -62,7 +62,7 @@ tasks: - "Authorization: token $(decrypt(gitToken,keyfile))" - "-H" - "Content-Type: application/json" - - "@(git)/api/v1/repos/golang/$(gitRepo)/releases" + - "@(packages)/$(gitRepo)/releases" - "-d" - '{"tag_name": "$(version)","name": "$(version)","body": "## Changes\n- Release via API","draft": false,"prerelease": false}' parsers: diff --git a/development/release-app.yaml b/development/release-app.yaml index 12c9273..ce8abd6 100644 --- a/development/release-app.yaml +++ b/development/release-app.yaml @@ -13,6 +13,7 @@ tasks: unixPassword: $(unixPassword) installPath: $(installPath) keyfile: $(keyfile) + packages: $(packages) loop: values: $(app.targets) as: target diff --git a/development/release-target.yaml b/development/release-target.yaml index aedb50e..24a993b 100644 --- a/development/release-target.yaml +++ b/development/release-target.yaml @@ -56,7 +56,7 @@ tasks: - "Content-Type: application/octet-stream" - "--data-binary" - "@$(destDir)/$(name)_$(version)_$(target.buildGoos)-$(target.buildGoarch).tar.gz" - - "@(git)/api/v1/repos/golang/$(name)/releases/$(releaseId)/assets?name=$(name)_$(version)_$(target.buildGoos)-$(target.buildGoarch).tar.gz" + - "@(packages)/$(name)/$(version)/$(name)_$(version)_$(target.buildGoos)-$(target.buildGoarch).tar.gz" - execute: description: "Upload Checksum File" @@ -71,7 +71,7 @@ tasks: - "Content-Type: application/octet-stream" - "--data-binary" - "@$(destDir)/$(name)_$(version)_$(target.buildGoos)-$(target.buildGoarch).sha256" - - "@(git)/api/v1/repos/golang/$(name)/releases/$(releaseId)/assets?name=$(name)_$(version)_$(target.buildGoos)-$(target.buildGoarch).sha256" + - "@(packages)/$(name)/$(version)/$(name)_$(version)_$(target.buildGoos)-$(target.buildGoarch).sha256" - execute: description: "Install binary" diff --git a/development/release.yaml b/development/release.yaml index 658dbcb..c051647 100644 --- a/development/release.yaml +++ b/development/release.yaml @@ -70,6 +70,7 @@ tasks: gitToken: $(git_token) unixPassword: $(unix_password) installPath: $(install_path) + packages: $(packages) loop: values: $(apps) as: app diff --git a/system/upgrade_applications.yaml b/system/upgrade_applications.yaml index 7670dfb..fe60df0 100644 --- a/system/upgrade_applications.yaml +++ b/system/upgrade_applications.yaml @@ -11,8 +11,7 @@ tasks: script: "@(system)/upgrade_github_application.yaml" args: settings: $(settings) - gitUsername: $(git_username) - gitPassword: $(git_password) + gitToken: $(git_token) keyfile: $(keyfile) loop: values: $(github) @@ -23,8 +22,7 @@ tasks: script: "@(system)/upgrade_orchestra_application.yaml" args: settings: $(settings) - gitUsername: $(git_username) - gitPassword: $(git_password) + gitToken: $(git_token) keyfile: $(keyfile) loop: values: $(orchestra) diff --git a/system/upgrade_github_application.yaml b/system/upgrade_github_application.yaml index 70a5991..e32c183 100644 --- a/system/upgrade_github_application.yaml +++ b/system/upgrade_github_application.yaml @@ -81,22 +81,22 @@ tasks: exec: "curl" args: - "-sS" - - "--user" - - "$(decrypt(gitUsername,keyfile)):$(decrypt(gitPassword,keyfile))" + - "-H" + - "Authorization: token $(decrypt(gitToken,keyfile))" - "--upload-file" - "$(tempdir())/$(archive_file)" - - "@(git)/api/packages/public/generic/$(settings.name)/$(new_version)/$(package_file)" + - "@(packages)/$(settings.name)/$(new_version)/$(package_file)" - execute: description: "Upload checksum $(sha256_file)" exec: "curl" args: - "-sS" - - "--user" - - "$(decrypt(gitUsername,keyfile)):$(decrypt(gitPassword,keyfile))" + - "-H" + - "Authorization: token $(decrypt(gitToken,keyfile))" - "--upload-file" - "$(tempdir())/$(sha256_file)" - - "@(git)/api/packages/public/generic/$(settings.name)/$(new_version)/$(sha256_package_file)" + - "@(packages)/$(settings.name)/$(new_version)/$(sha256_package_file)" # - execute: # description: "Upload application $(archive_file)"