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

feat: reorganize repo for Aurora builds #1091

Merged
merged 12 commits into from
Apr 6, 2024
Merged

feat: reorganize repo for Aurora builds #1091

merged 12 commits into from
Apr 6, 2024

Conversation

m2Giles
Copy link
Member

@m2Giles m2Giles commented Apr 6, 2024

Reorganization of repo in order to support Aurora.

Containerfile restructured to remove inline shell. Instead everything is built out of sourced shell files in /tmp/build

This is still a work in progress. The github actions need to be updated.

build_files/base/copr-repos.sh Outdated Show resolved Hide resolved
Comment on lines 4 to 5

. /tmp/build/copr-repos.sh
Copy link
Member

@p5 p5 Apr 6, 2024

Choose a reason for hiding this comment

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

Would it be good to just run this in a for loop over all .sh files in the directory?
We can prefix the names with numbers to control the execution order

If you prefer it as-is, I'm okay with that too

Copy link
Member Author

Choose a reason for hiding this comment

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

That could also work. With this method, we can inline things like that singular rpm-ostree install. But I like the loop method to make us more purposeful with changes. I personally like this source method to not worry about the +x bit.

Containerfile Outdated Show resolved Hide resolved
# Copy Bluefin CLI packages
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/atuin /usr/bin/atuin
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/share/bash-prexec /usr/share/bash-prexec
# COPY ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
Copy link
Member

Choose a reason for hiding this comment

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

Out of scope for this PR, but a thought - would it be good to move this to scripts too, and use skopeo or similar to extract these files?

Copy link
Member Author

Choose a reason for hiding this comment

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

That would be nicer. We could remove a few of these COPY layers with that.

@m2Giles m2Giles marked this pull request as ready for review April 6, 2024 23:04
@m2Giles m2Giles requested a review from castrojo as a code owner April 6, 2024 23:04
@castrojo castrojo merged commit 3dc2b8a into main Apr 6, 2024
19 of 35 checks passed
@castrojo castrojo deleted the repo_reorganization branch April 6, 2024 23:20
awesomekyle pushed a commit to awesomekyle/bluefin that referenced this pull request Apr 24, 2024
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