Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ steps:
commands:
- cd "/go/src/github.com/gravitational/teleport/build.assets/tooling"
- 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
-tag-workflow -timeout 2h30m0s -workflow release-mac-amd64.yaml -workflow-ref=${DRONE_BRANCH}
-tag-workflow -timeout 2h30m0s -workflow release-mac.yaml -workflow-ref=${DRONE_BRANCH}
-input oss-teleport-repo=${DRONE_REPO} -input oss-teleport-ref=${DRONE_COMMIT}
-input "build-packages=false" -input "release-artifacts=false" '
environment:
Expand Down Expand Up @@ -4278,7 +4278,7 @@ steps:
commands:
- cd "/go/src/github.com/gravitational/teleport/build.assets/tooling"
- 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
-tag-workflow -timeout 2h30m0s -workflow release-mac-amd64.yaml -workflow-ref=${DRONE_TAG}
-tag-workflow -timeout 2h30m0s -workflow release-mac.yaml -workflow-ref=${DRONE_TAG}
-input oss-teleport-repo=${DRONE_REPO} -input oss-teleport-ref=${DRONE_TAG} -input
"build-packages=true" -input "release-artifacts=true" '
environment:
Expand Down Expand Up @@ -17179,6 +17179,6 @@ image_pull_secrets:
- DOCKERHUB_CREDENTIALS
---
kind: signature
hmac: 137bb34b614d6b33001c00d069a4afbeaf751344c50a9bb9558007412cbd3ab2
hmac: a9344cfad6d8a4736f256325c52fb7238c729ec00c1ca15171645f23f357a7d8

...
6 changes: 4 additions & 2 deletions dronegen/mac_gha.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@ import "time"
// * a package with the tsh binary.
// * a disk image (dmg) of Teleport Connect containing the signed tsh package.
// These build assets are signed and notarized.
// The tarballs are build for amd64, arm64 and universal. The packages and
// disk image are build for universal only.
func darwinTagPipelineGHA() pipeline {
bt := ghaBuildType{
buildType: buildType{os: "darwin", arch: "amd64"},
trigger: triggerTag,
pipelineName: "build-darwin-amd64",
workflows: []ghaWorkflow{
{
name: "release-mac-amd64.yaml",
name: "release-mac.yaml",
srcRefVar: "DRONE_TAG",
ref: "${DRONE_TAG}",
timeout: 150 * time.Minute,
Expand Down Expand Up @@ -58,7 +60,7 @@ func darwinPushPipelineGHA() pipeline {
pipelineName: "push-build-darwin-amd64",
workflows: []ghaWorkflow{
{
name: "release-mac-amd64.yaml",
name: "release-mac.yaml",
srcRefVar: "DRONE_COMMIT",
ref: "${DRONE_BRANCH}",
timeout: 150 * time.Minute,
Expand Down
2 changes: 1 addition & 1 deletion e
Submodule e updated from 5bb201 to 8473c9