Merge pull request #29874 from loganharbour/29873_language_server

Update language server extension in `moose-dev`

Author: loganharbour

apptainer/files/moose-dev/opt/code-server/bin/code-server-start

@@ -11,19 +11,23 @@
 # - CODE_SERVER_DATAROOT:        The data root to use for code server and the extensions.
 #                                If not set, the default by code-server will be used.
 # - CODE_SERVER_SKIP_EXTENSIONS: Set to anything to skip the install of extensions
+# - UNSET_APPTAINER_VARS:        Set to anything to unset APPTAINER/SINGULARITY vars
 
 set -e
 
 # The port to run on, auto set to 8080
-CODE_SERVER_PORT=${CODE_SERVER_PORT:-8080}
+PORT=${CODE_SERVER_PORT:-8080}
+unset CODE_SERVER_PORT
 
 # The password to connect with, if one is not provided (randomly generated)
+PASSWORD=
 if [ -z "$CODE_SERVER_PASSWORD" ]; then
-  export PASSWORD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 24)
+  PASSWORD="$(tr -dc A-Za-z0-9 </dev/urandom | head -c 24)"
 # Password was provided, so don't show it
 else
-  export PASSWORD="${CODE_SERVER_PASSWORD}"
+  PASSWORD="${CODE_SERVER_PASSWORD}"
 fi
+export PASSWORD
 
 # Create the dataroot if it doesn't exist + the extensions
 if [ -n "$CODE_SERVER_DATAROOT" ]; then
@@ -40,23 +44,32 @@ fi
 # Install the extensions, unless requested not to
 if [ -z "$CODE_SERVER_SKIP_EXTENSIONS" ]; then
   /opt/code-server/bin/code-server-setup-extensions "${CODE_SERVER_ARGS[@]}"
+else
+  unset CODE_SERVER_SKIP_EXTENSIONS
 fi
 
 # Pass the dataroot if its set
 if [ -n "$CODE_SERVER_DATAROOT" ]; then
   CODE_SERVER_ARGS+=("--user-data-dir=${CODE_SERVER_DATAROOT}")
 fi
+unset CODE_SERVER_DATAROOT
 
 # Expose the password to the user if we set it
 if [ -z "$CODE_SERVER_PASSWORD" ]; then
   GREEN='\033[0;32m'
   NC='\033[0m'
-  printf "${GREEN}Connect to the instance at http://localhost:${CODE_SERVER_PORT} with password ${PASSWORD}${NC}\n"
+  printf "${GREEN}Connect to the instance at http://localhost:${PORT} with password ${PASSWORD}${NC}\n"
+else
+  unset CODE_SERVER_PASSWORD
+fi
+
+if [ -n "$UNSET_APPTAINER_VARS" ]; then
+  unset "${!APPTAINER@}" "${!SINGULARITY@}" UNSET_APPTAINER_VARS
 fi
 
 # Run the server
 code-server --auth=password \
-            --bind-addr=0.0.0.0:"${CODE_SERVER_PORT}" \
+            --bind-addr=0.0.0.0:"${PORT}" \
             --disable-telemetry \
             --disable-getting-started-override \
             --disable-update-check \

apptainer/moose-dev.def

@@ -82,7 +82,7 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
     # Pinned versions
     MINIFORGE_VERSION=23.3.1-1
     PYTHON_VERSION=3.11
-    CODE_SERVER_VERSION=4.92.2
+    CODE_SERVER_VERSION=4.96.4
 
     # Install code-server
     CODE_SERVER_FILE=code-server-${CODE_SERVER_VERSION}-amd64.rpm
@@ -96,9 +96,9 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
     # by the "setup-code-server-extensions" script (in PATH)
     mkdir /opt/code-server/extensions
     # Download extensions for code-server, currently just moose language support
-    MOOSE_LANGUAGE_SUPPORT_VERSION=1.1.2
+    MOOSE_LANGUAGE_SUPPORT_VERSION=1.3.2
     cd /opt/code-server/extensions
-    curl -L -O https://github.com/idaholab/moose-language-support/releases/download/v${MOOSE_LANGUAGE_SUPPORT_VERSION}/DanielSchwen.moose-language-support-${MOOSE_LANGUAGE_SUPPORT_VERSION}.vsix
+    curl -L -O https://github.com/idaholab/moose-language-support/releases/download/v${MOOSE_LANGUAGE_SUPPORT_VERSION}/moose-language-support-${MOOSE_LANGUAGE_SUPPORT_VERSION}.vsix
 
     # Setup permissions for the code server extras
     find /opt/code-server -type d -exec chmod 755 {} +

conda/moose-dev/meta.yaml

@@ -2,7 +2,7 @@
 # REMEMBER TO UPDATE the .yaml files for the following packages:
 #   moose/conda_build_config.yaml
 # As well as any directions pertaining to modifying those files.
-{% set version = "2024.12.23" %}
+{% set version = "2024.02.12" %}
 
 package:
   name: moose-dev

conda/moose/conda_build_config.yaml

@@ -3,7 +3,7 @@ mpi:
   - openmpi
 
 moose_dev:
-  - moose-dev 2024.12.23
+  - moose-dev 2024.02.12
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

scripts/tests/test_versioner.py

@@ -32,7 +32,9 @@ def testOldHashes(self):
         for hash, packages in OLD_HASHES.items():
             meta = versioner.version_meta(hash)
             for package, package_hash in packages.items():
-                self.assertEqual(str(package_hash), str(meta[package]['hash']))
+                actual_package_hash = str(meta[package]['hash'])
+                message = f'Commit {hash}, package {package}: expected = {package_hash}, actual = {actual_package_hash}'
+                self.assertEqual(str(package_hash), actual_package_hash, message)
 
     def testBadCommit(self):
         with self.assertRaises(Exception) as e:

scripts/tests/versioner_hashes.yaml

@@ -397,3 +397,10 @@ cece3f711bd9c235af31c9d5a4c54e292400ecc1: #29074
   libmesh: b8b3d69
   wasp: 2fbcef5
   moose-dev: 5e9be02
+d5e5defe99e1214278c8353e136b2ec38ffeab67: #29874
+  tools: 5abb5f2
+  mpi: 82bbd28
+  petsc: e78a9a4
+  libmesh: b8b3d69
+  wasp: 2fbcef5
+  moose-dev: '0443606'

scripts/versioner.py

@@ -173,14 +173,14 @@ def verify_recipes(self, args) ->str:
     def output_summary(self, args):
         """ generate summary report that can be used to generate versioner_hash blocks """
         head = self.version_meta(args.commit, full_hash=True)["app"]["hash"]
-        formatted_output = f'{head}: #PR\n'
+        output = {head: {}}
         for library in TRACKING_LIBRARIES:
             if library == 'app':
                 continue
             meta = self.version_meta(args.commit).get(library, {})
             meta_hash = meta['hash']
-            formatted_output+=f'  {library}: {meta_hash}\n'
-        return formatted_output
+            output[head][library] = str(meta_hash)
+        return yaml.dump(output, sort_keys=False)
 
     def output_cli(self, args):
         """ performs command line actions """