Skip to content

fix some imagebuilder not including variant in the name#52

Open
cramt wants to merge 1 commit into
astro:mainfrom
cramt:fix_some_imagebuilder_files_not_including_variant
Open

fix some imagebuilder not including variant in the name#52
cramt wants to merge 1 commit into
astro:mainfrom
cramt:fix_some_imagebuilder_files_not_including_variant

Conversation

@cramt

@cramt cramt commented Feb 21, 2025

Copy link
Copy Markdown

Some imagebuilders just dont have the variant in their name for.... reasons (example tplink-archer-c5-v2), took a while to debug but the fix is trivial to just add a baseFileName without the variant to the list of possible names

sorry about the formatting, ill use your formatting config if you want me to

@nix-ci-app

nix-ci-app Bot commented Feb 21, 2025

Copy link
Copy Markdown

NixCI is ready to run on this PR.
Maintainer: Comment nix-ci run to run now.

@astro

astro commented Feb 22, 2025

Copy link
Copy Markdown
Owner

Thank you!

The diff is hard to read, so I would love to have the reformatting in a separate commit, if you think the reformatting makes sense.

@astro

astro commented Sep 9, 2025

Copy link
Copy Markdown
Owner

Even a word-diff isn't helpful here. Did you reformat automatically? Which tool did you use? I could try redoing it myself in a separate commit.

@cramt

cramt commented Sep 10, 2025

Copy link
Copy Markdown
Author

oh sorry i completely forgot about this, the actual change is just this

        baseFileNames = [
          "${imageBuilderPrefix}${target}-${variant}.${uname.system}-${uname.processor}"
          "${imageBuilderPrefix}${target}.${uname.system}-${uname.processor}"
        ];
        possibleFileNames = lib.lists.flatten (builtins.map (extension: builtins.map (baseFileName: "${baseFileName}${extension}") baseFileNames) [".tar.zst" ".tar.xz"]);
        matches = builtins.filter (fileName: builtins.hasAttr fileName variantFiles) possibleFileNames;

@cramt

cramt commented Sep 10, 2025

Copy link
Copy Markdown
Author

yeah might be best to do in a seperate commit due to there also being merge conflicts with this pr

@SuperSandro2000

Copy link
Copy Markdown
Collaborator

Please re-create that PR without the formatting changes, only than I am going to take a look at the actual change.

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