Skip to content

[licensor] force preinstall to build liblicensor.a #9721

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

Merged
merged 1 commit into from
May 4, 2022

Conversation

nandajavarma
Copy link
Contributor

@nandajavarma nandajavarma commented May 3, 2022

Description

This PR fixes the current break in build when opening a workspace from gitpod main.

licensor/typescript currently do not rebuild since the build is triggered by the presence of a .a file. Since #9343 requires rebuild of the liblicensor.a file and api.ts (built using genapi.go), this PR deletes the .a file to force the rebuild.

Related Issue(s)

Fixes #

How to test

Open a workspace from this branch, the errors in the build should be resolved.

Release Notes

None

Documentation

@nandajavarma nandajavarma requested a review from a team May 3, 2022 13:11
@nandajavarma nandajavarma requested a review from a team May 3, 2022 13:11
@roboquat roboquat added the size/S label May 3, 2022
@github-actions github-actions bot added team: webapp Issue belongs to the WebApp team team: delivery Issue belongs to the self-hosted team labels May 3, 2022
@@ -31,6 +31,14 @@ export interface LicensePayload {
seats: number
}

export enum LicenseSubscriptionLevel {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should there be a duplicate of community and prod?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

CommunityLicense and ProfessionalLicense were introduced in the licensor code for the Gitpod license levels. This duplication exists now, since I was trying to standardize the license level names and didn't want to change the replicated code too much. We can clean it up in the future, right now this is a requirement of the existing code.

Copy link
Contributor

@corneliusludmann corneliusludmann May 4, 2022

Choose a reason for hiding this comment

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

Thanks for the quick fix, Nandaja. 🥳

I know, it's less convenient, but I think having 2 separate pull requests (one PR per concern) would help us in general. In this specific case, the discussion about the LicenseSubscriptionLevel blocks merging the build fix. Also, it wouldn't need approvals from 2 different teams. What do you think? 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@corneliusludmann I agree with one issue per PR comment. Unfortunately here, if we force the build, it will update api.ts(this file is auto-generated by genapi). Meaning that people will have a change to be staged in their workspace which is not very nice. This is a mistake on my part, not including it in the license UI PR. But the fact that changes in this PR regenerates api.ts makes this change related to the main issue.

Copy link
Contributor

@corneliusludmann corneliusludmann left a comment

Choose a reason for hiding this comment

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

Don't know how to test this but changes look good so far.

Copy link
Member

@AlexTugarev AlexTugarev left a comment

Choose a reason for hiding this comment

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

Thanks for the fix!

@roboquat roboquat merged commit ffe96c5 into main May 4, 2022
@roboquat roboquat deleted the nvn/install-static-lib branch May 4, 2022 12:20
@roboquat roboquat added the deployed: webapp Meta team change is running in production label May 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: webapp Meta team change is running in production release-note-none size/S team: delivery Issue belongs to the self-hosted team team: webapp Issue belongs to the WebApp team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants