Skip to content

Remove old promote step#16986

Merged
logand22 merged 6 commits into
masterfrom
logan/remove-old-promote-step
Oct 5, 2022
Merged

Remove old promote step#16986
logand22 merged 6 commits into
masterfrom
logan/remove-old-promote-step

Conversation

@logand22
Copy link
Copy Markdown
Contributor

@logand22 logand22 commented Oct 4, 2022

This PR removes a step from drone that is now failing in v11 promotion events. See https://drone.platform.teleport.sh/gravitational/teleport/16096/5/5 for the failing drone example.

It also includes a change to mac.go in dronegen that was added to dronegen but not updated through a call to make dronegen. See #15874

Credit to @wadells for finding the issue.

Testing

https://drone.platform.teleport.sh/gravitational/teleport/16121/5/1

@zmb3
Copy link
Copy Markdown
Collaborator

zmb3 commented Oct 4, 2022

@Joerger are we okay with the LIBPCSLITE changes here?

Comment thread .drone.yml Outdated
- cd $WORKSPACE_DIR/go/src/github.com/gravitational/teleport
- build.assets/build-fido2-macos.sh build
- export PKG_CONFIG_PATH="$(build.assets/build-fido2-macos.sh pkg_config_path)"
- make clean release OS=$OS ARCH=$ARCH FIDO2=yes TOUCHID=yes LIBPCSCLITE=yes
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was LIBPCSCLITE=yes removed here and below? cc @jakule

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see #15874 where this value was updated in dronegen/mac.go but was not updated in the .drone.yml file via make dronegen.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha - @jakule @Joerger can you confirm this is intended change?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this is correct, sorry for the confusion.

@logand22 logand22 enabled auto-merge (squash) October 4, 2022 19:02
@jakule jakule mentioned this pull request Oct 4, 2022
@logand22 logand22 merged commit 8d01216 into master Oct 5, 2022
@zmb3 zmb3 deleted the logan/remove-old-promote-step branch May 7, 2024 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants