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
4 changes: 1 addition & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -911,8 +911,6 @@ clone:
disable: true
depends_on:
- clean-up-previous-build
concurrency:
limit: 1
steps:
- name: Check out Teleport
commands:
Expand Down Expand Up @@ -18260,6 +18258,6 @@ volumes:
temp: {}
---
kind: signature
hmac: 557686dce15dbf97c5dfdeae90f596e9cb38f17dd343600b81dcdd46f3d873ab
hmac: 403e9040b75b1594e85c110e5fd3dfceed2f6e8f99e8ee1bec08af51d5ffc5ba

...
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1159,10 +1159,12 @@ init-submodules-e:
# dronegen generates .drone.yml config
#
# Usage:
# - install github.com/gravitational/tdr
# - set $DRONE_TOKEN and $DRONE_SERVER (https://drone.platform.teleport.sh)
# - install drone cli
# - set $DRONE_TOKEN
# - tsh login --proxy=platform.teleport.sh
# - tsh app login drone
# - tsh proxy app drone
# - export DRONE_SERVER=https://localhost:$TSH_PROXY_PORT
# - make dronegen
.PHONY: dronegen
dronegen:
Expand Down
8 changes: 4 additions & 4 deletions dronegen/drone_cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"os/exec"
)

func checkTDR() error {
if _, err := exec.LookPath("tdr"); err != nil {
return fmt.Errorf("can't find tdr in $PATH: %w; get it from https://github.com/gravitational/tdr/", err)
func checkDrone() error {
if _, err := exec.LookPath("drone"); err != nil {
return fmt.Errorf("can't find drone in $PATH: %w; get it from https://docs.drone.io/cli/install/ or `brew install drone`", err)
}
if os.Getenv("DRONE_SERVER") == "" || os.Getenv("DRONE_TOKEN") == "" {
return fmt.Errorf("$DRONE_SERVER and/or $DRONE_TOKEN env vars not set; get them at https://drone.platform.teleport.sh/account")
Expand All @@ -31,7 +31,7 @@ func checkTDR() error {
}

func signDroneConfig() error {
out, err := exec.Command("tdr", "sign", "gravitational/teleport", "--save").CombinedOutput()
out, err := exec.Command("drone", "sign", "gravitational/teleport", "--save").CombinedOutput()
if err != nil {
if len(out) > 0 {
err = fmt.Errorf("drone signing failed: %v\noutput:\n%s", err, out)
Expand Down
2 changes: 1 addition & 1 deletion dronegen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

func main() {
if err := checkTDR(); err != nil {
if err := checkDrone(); err != nil {
fmt.Println(err)
os.Exit(1)
}
Expand Down
1 change: 0 additions & 1 deletion dronegen/windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ func windowsTagPipeline() pipeline {

p.DependsOn = []string{tagCleanupPipelineName}
p.Trigger = triggerTag
p.Concurrency.Limit = 1
p.Steps = []step{
cloneWindowsRepositoriesStep(p.Workspace.Path),
updateWindowsSubreposStep(p.Workspace.Path),
Expand Down