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

build: determine electron version from tags not files #36106

Merged
merged 9 commits into from Oct 25, 2022

Conversation

MarshallOfSound
Copy link
Member

This does a few cool things

  • Version is no longer stored on disk, meaning we don't need a commit to bump the version
  • electron.rc is now generated instead of being updated via the bump script
  • SUPPORT.md is no longer updated automatically (we should replace this with some other automation)

All this means that we should be able to turn on signed commit enforcement because sudowoodo will no longer need to push commits.

Notes: no-notes

@MarshallOfSound MarshallOfSound requested review from a team as code owners October 22, 2022 00:12
@MarshallOfSound MarshallOfSound added target/19-x-y target/21-x-y PR should also be added to the "21-x-y" branch. target/22-x-y PR should also be added to the "22-x-y" branch. labels Oct 22, 2022
@MarshallOfSound MarshallOfSound merged commit 7ca2bb5 into main Oct 25, 2022
@MarshallOfSound MarshallOfSound deleted the tag-based-versioning branch October 25, 2022 06:44
@release-clerk
Copy link

release-clerk bot commented Oct 25, 2022

No Release Notes

@trop
Copy link
Contributor

trop bot commented Oct 25, 2022

I was unable to backport this PR to "19-x-y" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Oct 25, 2022

I was unable to backport this PR to "20-x-y" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Oct 25, 2022

I was unable to backport this PR to "21-x-y" cleanly;
you will need to perform this backport manually.

@trop trop bot removed the target/20-x-y label Oct 25, 2022
@trop
Copy link
Contributor

trop bot commented Oct 25, 2022

I was unable to backport this PR to "22-x-y" cleanly;
you will need to perform this backport manually.

@trop trop bot removed the target/21-x-y PR should also be added to the "21-x-y" branch. label Oct 25, 2022
@trop
Copy link
Contributor

trop bot commented Oct 26, 2022

@VerteDinde has manually backported this PR to "21-x-y", please check out #36135

@trop
Copy link
Contributor

trop bot commented Oct 26, 2022

@VerteDinde has manually backported this PR to "20-x-y", please check out #36136

@trop
Copy link
Contributor

trop bot commented Oct 26, 2022

@VerteDinde has manually backported this PR to "19-x-y", please check out #36137

jkleinsc pushed a commit that referenced this pull request Oct 27, 2022
* build: determine electron version from tags not files (#36106)

* build: determine electron version from tags not files

* build: make electron_version dependent on packed-refs and git HEAD

* build: do not delete electron/.git

* build: do not revert a commit we didn't make

* build: gen version file instead of just writing it

* build: update cache and ninja targets

* build: copy resource.h to generated electron.rc

* build: electron_win32_resources should be public deps

* build: also copy the icon

Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org>

* build: ensure get-version runs in the electron git checkout (#36128)

* build: strip v in the getElectronVersion helper

Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org>
Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: Samuel Attard <sattard@salesforce.com>
@trop trop bot added merged/22-x-y PR was merged to the "22-x-y" branch. and removed in-flight/22-x-y labels Oct 27, 2022
VerteDinde added a commit that referenced this pull request Oct 28, 2022
* build: determine electron version from tags not files (#36106)

* build: determine electron version from tags not files

* build: make electron_version dependent on packed-refs and git HEAD

* build: do not delete electron/.git

* build: do not revert a commit we didn't make

* build: gen version file instead of just writing it

* build: update cache and ninja targets

* build: copy resource.h to generated electron.rc

* build: electron_win32_resources should be public deps

* build: also copy the icon

Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org>

* chore: fixup patches

* chore: update patches

* build: ensure get-version runs in the electron git checkout (#36128)

* build: strip v in the getElectronVersion helper

* build: use npm@7 for npm view command

Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: Samuel Attard <sattard@salesforce.com>
@trop trop bot added merged/21-x-y PR was merged to the "21-x-y" branch. merged/20-x-y and removed in-flight/21-x-y labels Oct 28, 2022
VerteDinde added a commit that referenced this pull request Oct 30, 2022
* build: determine electron version from tags not files (#36106)

* build: determine electron version from tags not files

* build: make electron_version dependent on packed-refs and git HEAD

* build: do not delete electron/.git

* build: do not revert a commit we didn't make

* build: gen version file instead of just writing it

* build: update cache and ninja targets

* build: copy resource.h to generated electron.rc

* build: electron_win32_resources should be public deps

* build: also copy the icon

Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org>

* chore: fixup patches

* chore: update patches

* build: ensure get-version runs in the electron git checkout (#36128)

* build: strip v in the getElectronVersion helper

* build: use npm@7 for npm view command

Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@salesforce.com>
VerteDinde added a commit that referenced this pull request Oct 30, 2022
* build: determine electron version from tags not files (#36106)

* build: determine electron version from tags not files

* build: make electron_version dependent on packed-refs and git HEAD

* build: do not delete electron/.git

* build: do not revert a commit we didn't make

* build: gen version file instead of just writing it

* build: update cache and ninja targets

* build: copy resource.h to generated electron.rc

* build: electron_win32_resources should be public deps

* build: also copy the icon

Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org>

* chore: fixup patches

* chore: update patches

* build: ensure get-version runs in the electron git checkout (#36128)

* build: strip v in the getElectronVersion helper

* build: use npm@7 for npm view command

Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@salesforce.com>
khalwa pushed a commit to solarwindscloud/electron that referenced this pull request Feb 22, 2023
* build: determine electron version from tags not files

* build: make electron_version dependent on packed-refs and git HEAD

* build: do not delete electron/.git

* build: do not revert a commit we didn't make

* build: gen version file instead of just writing it

* build: update cache and ninja targets

* build: copy resource.h to generated electron.rc

* build: electron_win32_resources should be public deps

* build: also copy the icon
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged/21-x-y PR was merged to the "21-x-y" branch. merged/22-x-y PR was merged to the "22-x-y" branch. semver/none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants