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

intermediate changes to schedule and config just rpm #80

Merged
merged 7 commits into from
May 6, 2023
Merged

intermediate changes to schedule and config just rpm #80

merged 7 commits into from
May 6, 2023

Conversation

bsherman
Copy link
Contributor

@bsherman bsherman commented Mar 30, 2023

This PR pairs with:

  1. feat: New akmods build process config#18
  2. feat: new akmods build process main#87

It accomplishes the two changes directly related to the above PRs which reduces the complexity of #72 , which is where I sourced these changes.

The merge process should be:

  1. feat: New akmods build process config#18 (wait for build success ⌚)
  2. feat: new akmods build process main#87 (wait for build success ⌚)
  3. intermediate changes to schedule and config just rpm #80 (celebrate 🥳)

the rpm will be built in config and installed in main
config and main repos are moving to earlier times and this should follow
@dhoell
Copy link

dhoell commented Mar 30, 2023

This removes the just build process and will likely (as far I read through it) cause the images to successfully build with just in main, but it will not enable the nvidia specific just commands added in the containerfile, which would be a regression.

@bsherman
Copy link
Contributor Author

This removes the just build process and will likely (as far I read through it) cause the images to successfully build with just in main, but it will not enable the nvidia specific just commands added in the containerfile, which would be a regression.

Agreed, I knew about that regression and didn't call it out, but arguably, there's already a bug in that the "main" justfile is not present.

I'm not sure if there was ever a plan for merging them...

I imagine, this nvidia build could check for the existence of /etc/justfile after installing ublue-os-just.rpm and append to it... but that breaks the concept of of the RPM controlling the files.

@bsherman
Copy link
Contributor Author

Thanks for pointing out that I'd missed where you already solved this.

Fixed.

@bsherman bsherman changed the title intermediate changes to for schedule and config just rpm intermediate changes to schedule and config just rpm Apr 3, 2023
@castrojo castrojo enabled auto-merge May 6, 2023 04:15
@castrojo castrojo added this pull request to the merge queue May 6, 2023
Merged via the queue into ublue-os:main with commit c807378 May 6, 2023
@bsherman bsherman deleted the intermediate-schedule-just branch May 6, 2023 05:39
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