Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dronegen/mac.go: Sync Connect version with Teleport #13099

Merged
merged 10 commits into from
Jun 7, 2022

Conversation

ravicious
Copy link
Member

@ravicious ravicious commented Jun 2, 2022

An improvement to #12257.

This PR makes it so that instead of using the version field from packages/teleterm/package.json, electron-builder will use the version number passed through CLI flags. This will make sure that Connect always uses the same version number as other Teleport artifacts.

Also, the Drone build number will be added as BUILD_NUMBER so that it'll be visible in the final app (1337 in the screenshot).

Connect version

The Drone run with recent changes: https://drone.platform.teleport.sh/gravitational/teleport/12533/12/1

@zmb3
Copy link
Collaborator

zmb3 commented Jun 2, 2022

Make sure to re-run dronegen on #12257 if you merge this in.

Base automatically changed from zmb3/build-teleport-connect to master June 3, 2022 02:19
@ravicious ravicious force-pushed the ravicious/connect-build-improvements branch from ddaec35 to 6cc92d9 Compare June 3, 2022 09:03
@ravicious ravicious changed the title Get Teleport Connect dir from package.json Get Teleport Connect dir from package.json & sync version with Teleport Jun 6, 2022
@ravicious ravicious changed the title Get Teleport Connect dir from package.json & sync version with Teleport dronegen/mac.go: Sync Connect version with Teleport Jun 6, 2022
@ravicious
Copy link
Member Author

I reverted the change which dynamically looks up which dir Teleport Connect is built under. At this point in the build script, yarn is already not available and I didn't want to spend too much time trying to persist this information across steps.

At least now I know that if we ever decide to change the name of the dir, updating the build steps won't be as hard as I thought it'd be.

@ravicious ravicious enabled auto-merge (squash) June 7, 2022 09:18
@ravicious ravicious merged commit 3c5eb09 into master Jun 7, 2022
@ravicious ravicious deleted the ravicious/connect-build-improvements branch June 7, 2022 09:59
ravicious added a commit to gravitational/webapps that referenced this pull request Jun 8, 2022
ravicious added a commit to gravitational/webapps that referenced this pull request Jun 10, 2022
ravicious added a commit to gravitational/webapps that referenced this pull request Jun 13, 2022
* Remove get-teleport-connect-dir

We didn't end up using it, see gravitational/teleport#13099.

* Run build-term & package-term in Webapps-Build pipeline

* Remove build script from package.json

It seems like it's no longer used anywhere at this point.
hatched pushed a commit to hatched/teleport-merge that referenced this pull request Nov 30, 2022
* Remove get-teleport-connect-dir

We didn't end up using it, see gravitational#13099.

* Run build-term & package-term in Webapps-Build pipeline

* Remove build script from package.json

It seems like it's no longer used anywhere at this point.
hatched pushed a commit that referenced this pull request Dec 20, 2022
* Remove get-teleport-connect-dir

We didn't end up using it, see #13099.

* Run build-term & package-term in Webapps-Build pipeline

* Remove build script from package.json

It seems like it's no longer used anywhere at this point.
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.

3 participants