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

refactor: Shorten FEDORA_VERSION line #90

Merged
merged 4 commits into from
Jun 1, 2023

Conversation

JosSamLoh
Copy link

Make grep use '-P' flag to use positive lookbehind on 'VERSION_ID=' and then use '-o' to only output the one or more digit characters matched after that.

@JosSamLoh JosSamLoh requested a review from castrojo as a code owner May 30, 2023 03:03
@JosSamLoh JosSamLoh changed the title Shorten FEDORA_VERSION line improve: Shorten FEDORA_VERSION line May 30, 2023
@JosSamLoh JosSamLoh changed the title improve: Shorten FEDORA_VERSION line refactor: Shorten FEDORA_VERSION line May 30, 2023
Copy link
Member

@xynydev xynydev left a comment

Choose a reason for hiding this comment

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

Seems you accidentally pushed some personal changes here. Revert looks alright, though, and the change itself too. When making further contributions you should be using conventional commits, but it doesn't really matter here since I'm merging this by squash.

@xynydev xynydev enabled auto-merge (squash) May 31, 2023 16:09
JosSamLoh added 3 commits May 31, 2023 16:09
commit 4f7cf85
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 22:50:00 2023 +0000

    Update README.md

commit 2731976
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 22:48:59 2023 +0000

    Update README.md

commit ba81642
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 23:37:54 2023 +0100

    Update recipe.yml

commit acb26a1
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 23:35:51 2023 +0100

    Update Containerfile

commit 2e4fe76
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 23:27:32 2023 +0100

    Use latest stock image everywhere & update readme

commit c4e3a65
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 22:26:24 2023 +0100

    Revert "Add personal configuration"

    This reverts commit 57de97d.

commit 57de97d
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 14:31:23 2023 +0100

    Add personal configuration

commit b734ec7
Merge: d11894e 7eae762
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 02:36:29 2023 +0000

    Merge pull request #3 from JosSamLoh/live-replace-kernel

    Finalisation and comment improvements for kernel replacement script

commit 7eae762
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 03:30:30 2023 +0100

    Update replace-kernel.sh

commit 7a24634
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 03:22:27 2023 +0100

    Update replace-kernel.sh

commit 4eb0061
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 03:20:03 2023 +0100

    Update replace-kernel.sh

commit d11894e
Merge: 1b35a64 1a8e740
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 01:11:30 2023 +0000

    Merge pull request #2 from JosSamLoh/live-replace-kernel

    Introduce kernel replacement script and build off stock silverblue

commit 1a8e740
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 01:56:38 2023 +0100

    Update replace-kernel.sh

commit b2e2329
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 01:50:00 2023 +0100

    Update recipe.yml

commit 66888c5
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 01:46:16 2023 +0100

    Update recipe.yml

commit 52f59a5
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 01:41:54 2023 +0100

    Update recipe.yml

commit e70752c
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 01:37:38 2023 +0100

    Fixes

    Move back to base silverblue image

commit 8c4c35e
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 00:52:01 2023 +0100

    Update recipe.yml

commit 631cfff
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 00:49:00 2023 +0100

    Create replace-kernel.sh

commit f7aadf8
Author: JosSamLoh <[email protected]>
Date:   Tue May 30 00:48:51 2023 +0100

    Use stock silverblue image

commit 1b35a64
Merge: 5fa876b 3865401
Author: JosSamLoh <[email protected]>
Date:   Mon May 29 23:25:41 2023 +0000

    Merge pull request #1 from JosSamLoh/live-shorten-fedoraver

    Shorten FEDORA_VERSION

commit 5fa876b
Author: JosSamLoh <[email protected]>
Date:   Mon May 29 23:45:10 2023 +0100

    Update cosign.pub
This reverts commit cc0992264d57d032856e7e8c6cbad4f06b54b97f.
@xynydev xynydev force-pushed the live-shorten-fedoraver branch from 3ef58a0 to 0ca1946 Compare May 31, 2023 16:09
@xynydev
Copy link
Member

xynydev commented May 31, 2023

The build error appears to be rpmfusion. I cannot override merges, so we'll just have to wait this out. I tested the changes manually locally before merging.

Edit: Actually, the error was not happening in my PR. Will have to investigate closer.

@xynydev xynydev merged commit 2582585 into blue-build:template Jun 1, 2023
@JosSamLoh JosSamLoh deleted the live-shorten-fedoraver branch June 3, 2023 14:49
crawfordlong pushed a commit to crawfordlong/tui that referenced this pull request Jun 3, 2023
RoyalOughtness referenced this pull request in secureblue/secureblue Nov 27, 2023
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.

2 participants