Skip to content

runner.singularity: Explicitly support Apptainer's singularity when checking versions#343

Merged
tsibley merged 1 commit into
masterfrom
trs/apptainer-versions
Jan 11, 2024
Merged

runner.singularity: Explicitly support Apptainer's singularity when checking versions#343
tsibley merged 1 commit into
masterfrom
trs/apptainer-versions

Conversation

@tsibley
Copy link
Copy Markdown
Contributor

@tsibley tsibley commented Jan 10, 2024

My intent was (and remains) to try to maintain compatibility with both SingularityCE and Apptainer after the Singularity fork. I didn't realize/recall that Apptainer restarted version numbering when I added this version inspection!

It would be most ideal if Apptainer's singularity executable reported the equivalent/compatible SingularityCE version, but that's understandably difficult and so I get why it reports the Apptainer version instead.

Thanks to @osageorange for raising this issue, testing this patch, and reporting back that it works!

As SingularityCE and Apptainer continue to diverge, a more complicated treatment of them may be needed, but for now this should suffice.

Resolves #329.

Checklist

  • Checks pass

@tsibley tsibley requested a review from a team January 10, 2024 23:06
@tsibley tsibley force-pushed the trs/apptainer-versions branch from 5932e35 to cb89a34 Compare January 11, 2024 00:21
… checking versions

My intent was (and remains) to try to maintain compatibility with both
SingularityCE and Apptainer after the Singularity fork.  I didn't
realize/recall that Apptainer restarted version numbering when I added
this version inspection!

It would be most ideal if Apptainer's `singularity` executable reported
the equivalent/compatible SingularityCE version, but that's
understandably difficult and so I get why it reports the Apptainer
version instead.

Thanks to @osageorange for raising this issue, testing this patch, and
reporting back that it works!

As SingularityCE and Apptainer continue to diverge, a more complicated
treatment of them may be needed, but for now this should suffice.

Resolves <#329>.
@tsibley tsibley force-pushed the trs/apptainer-versions branch from cb89a34 to 8d8d531 Compare January 11, 2024 18:39
@tsibley tsibley changed the base branch from master to trs/appease-type-checker January 11, 2024 18:39
@tsibley
Copy link
Copy Markdown
Contributor Author

tsibley commented Jan 11, 2024

CI was failing type checking for changes in this PR (now fixed) and also for unrelated reasons (fixed in #344).

Base automatically changed from trs/appease-type-checker to master January 11, 2024 20:16
@tsibley tsibley merged commit af1f329 into master Jan 11, 2024
@tsibley tsibley deleted the trs/apptainer-versions branch January 11, 2024 22:30
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.

Singularity/Apptainer Version

2 participants