Skip to content

Merge release/2.2 into develop - #2207

Open
climbfuji wants to merge 17 commits into
JCSDA:developfrom
climbfuji:feature/merge_rel22_to_develop
Open

climbfuji wants to merge 17 commits into
JCSDA:developfrom
climbfuji:feature/merge_rel22_to_develop

Conversation

@climbfuji

@climbfuji climbfuji commented Nov 4, 2026 •

Copy link
Copy Markdown
Collaborator

Use of generative AI

Please refer to our temporary spack-stack AI policy for further information.

  • I confirm that this contribution was submitted by a real person. If AI tools or agents were used in its preparation, I have personally reviewed and take responsibility for all submitted content, code, and proposed changes. This contribution is not autonomously generated by AI.

Description

Merge release/2.2 into develop.

Dependencies

Issues addressed

Working toward #2177

Applications affected

None

Systems affected

None (all part of the release code)

Testing

  • CI: Note whether the automatic tests (GitHub actions tests that run automatically for every commit) pass or not
    • GitHub actions CI tests pass except unit tests, need update of spack submodule from develop
    • GitHub actions CI tests do not pass (provide explanation)
    • GitHub actions CI tests skipped (provide explanation if necessary)
  • New tests added: List and describe any new tests added to GitHub actions
    • ...
  • Additional testing: Add information on any additional tests conducted
    • ...

Checklist

  • This PR addresses one issue/problem/enhancement or has a very good reason for not doing so.
  • These changes have been tested on the affected systems and applications.
  • All dependency PRs/issues have been resolved and this PR can be merged.
  • All necessary updates to the documentation (spack-stack wiki) will be made when this PR is merged

climbfuji and others added 15 commits October 20, 2026 06:45
* Fixes for oneapi-compilers +fix_rt_linkage on Tier1 machines
* Fix ecflow for Ursa
* Fix intel/2025.3.0 compiler names for modules: noaa-aws and noaa-azure
…DA#2195)

For release/2.2: Add mapl@2.69.1 ^esmf@8.9.1 to unified environment (configs/templates/unified-dev/spack.yaml).
…u 26.04 (JCSDA#2197)

Brings the container site in line with tier1/aws-ubuntu for spack-stack 2.2. Ubuntu 26.04, GCC 14.3.0, OneAPI 2026.1.

Other changes:
- qt is built with gcc, because Qt 5.15 doesn't compile with icpx.
- The install step runs with build_language: C.UTF-8. Intel's umf modulefile prints "®" as a bare non-UTF-8 byte which spack can't decode otherwise.
- Builder stage sets MODULESHOME and MODULEPATH explcitly to fix spack module discovery.
- Updated load_jedi_bundle_env: for new meta-modules and some unexpected python odds and ends to fix the jedi build environment (as far as I can tell this is idiosyncratic to the container build; the base modules work better in the aws-ubuntu site, I will debug this issue later but for now the fixed loader enables successful jedi builds)
@climbfuji
climbfuji marked this pull request as ready for review November 20, 2026 02:40
@climbfuji
climbfuji requested review from AlexanderRichert-NOAA, eap, mathomp4 and natalie-perlin and removed request for eap November 20, 2026 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: In Progress

Development

Successfully merging this pull request may close these issues.

5 participants