Skip to content

Commit

Permalink
Fixed Drone syntax related to private repo publishing (gravitational#…
Browse files Browse the repository at this point in the history
  • Loading branch information
fheinecke authored Mar 24, 2023
1 parent d1708a3 commit a86aeb8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6851,7 +6851,7 @@ steps:
- mkdir -pv "$ARTIFACT_PATH"
- rm -rf "$ARTIFACT_PATH"/*
- if [ "${DRONE_REPO_PRIVATE}" = true ]; then ENT_FILTER="*ent"; fi
- FILTER="${ENT_FILTER}*.deb*"
- FILTER="${{ENT_FILTER}}*.deb*"
- aws s3 sync --no-progress --delete --exclude "*" --include "$FILTER" s3://$AWS_S3_BUCKET/teleport/tag/${DRONE_TAG##v}/
"$ARTIFACT_PATH"
environment:
Expand Down Expand Up @@ -7057,7 +7057,7 @@ steps:
- mkdir -pv "$ARTIFACT_PATH"
- rm -rf "$ARTIFACT_PATH"/*
- if [ "${DRONE_REPO_PRIVATE}" = true ]; then ENT_FILTER="*ent"; fi
- FILTER="${ENT_FILTER}*.rpm*"
- FILTER="${{ENT_FILTER}}*.rpm*"
- aws s3 sync --no-progress --delete --exclude "*" --include "$FILTER" s3://$AWS_S3_BUCKET/teleport/tag/${DRONE_TAG##v}/
"$ARTIFACT_PATH"
environment:
Expand Down Expand Up @@ -19039,6 +19039,6 @@ volumes:
temp: {}
---
kind: signature
hmac: e4246ddf96b001ad16148b53df25b46cfea9a9073ee53314e4072b345b2e2a3f
hmac: c91c3ca90f5be806baf14720a538b3ae500f47ce2acc2b022d34bbf96c3fa6da

...
2 changes: 1 addition & 1 deletion dronegen/os_repos.go
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ func (optpb *OsPackageToolPipelineBuilder) getVersionSteps(codePath, version str
// Conditionally match ONLY enterprise and fips binaries based off of file name,
// if running in the context of a private repo (teleport-private)
"if [ \"${DRONE_REPO_PRIVATE}\" = true ]; then ENT_FILTER=\"*ent\"; fi",
fmt.Sprintf("FILTER=\"${ENT_FILTER}*.%s*\"", optpb.packageType),
fmt.Sprintf("FILTER=\"${{ENT_FILTER}}*.%s*\"", optpb.packageType),
strings.Join(
[]string{
"aws s3 sync",
Expand Down

0 comments on commit a86aeb8

Please sign in to comment.