Revert many more updates in .github, configs and doc

JCSDA · Feb 1, 2024 · f57dd8c · f57dd8c
1 parent 11fdc06
commit f57dd8c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/.github/workflows/macos-ci-aarch64.yaml b/.github/workflows/macos-ci-aarch64.yaml
@@ -56,7 +56,11 @@ jobs:
           export SPACK_SYSTEM_CONFIG_PATH="${ENVDIR}/site"
 
           # Find external packages
-          spack external find --scope system --exclude bison --exclude openssl --exclude=gettext
+          spack external find --scope system --exclude bison --exclude openssl
+          spack external find --scope system perl
+          spack external find --scope system wget
+          PATH="/opt/homebrew/opt/curl/bin:$PATH" \
+              spack external find --scope system curl
           PATH="/opt/homebrew/opt/qt5/bin:$PATH" \
               spack external find --scope system qt
           spack external find --scope system texlive

diff --git a/.github/workflows/macos-ci-x86_64.yaml b/.github/workflows/macos-ci-x86_64.yaml
@@ -49,7 +49,11 @@ jobs:
           export SPACK_SYSTEM_CONFIG_PATH="${ENVDIR}/site"
 
           # Find external packages
-          spack external find --scope system --exclude bison --exclude openssl --exclude=gettext
+          spack external find --scope system --exclude bison --exclude openssl
+          spack external find --scope system perl
+          spack external find --scope system wget
+          PATH="/usr/local/opt/curl/bin:$PATH" \
+              spack external find --scope system curl
           PATH="/usr/local/opt/qt5/bin:$PATH" \
               spack external find --scope system qt
           spack external find --scope system texlive

diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml
@@ -113,9 +113,6 @@ jobs:
           spack config add "packages:all:compiler:[[email protected]]"
           sed -i "s/\['\%aocc', '\%apple-clang', '\%gcc', '\%intel'\]/\['\%intel'\]/g" $ENVDIR/spack.yaml
 
-          # Force using external curl to avoid duplicate packages being built
-          spack config add "packages:curl:buildable:false"
-
           # Add additional variants for MET packages, different from config/common/packages.yaml
           spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis"
 

diff --git a/configs/sites/macos.default/packages.yaml b/configs/sites/macos.default/packages.yaml
@@ -3,5 +3,7 @@ packages:
     variants: ~png ~svg
   git:
     buildable: false
+  libiconv:
+    buildable: false
   wgrib2:
     variants: ~openmp
diff --git a/doc/source/NewSiteConfigs.rst b/doc/source/NewSiteConfigs.rst
@@ -206,9 +206,18 @@ Remember to activate the ``lua`` module environment and have MacTeX in your sear
 
 .. code-block:: console
 
-   spack external find --scope system --exclude bison --exclude openssl --exclude=gettext
+   spack external find --scope system --exclude bison --exclude openssl
+   spack external find --scope system libiconv
+   spack external find --scope system perl
+   spack external find --scope system wget
    spack external find --scope system mysql
 
+   PATH="$HOMEBREW_ROOT/opt/curl/bin:$PATH" \
+        spack external find --scope system curl
+
+   PATH="$HOMEBREW_ROOT/opt/qt5/bin:$PATH" \
+       spack external find --scope system qt
+
    # Optional, only if planning to build jedi-tools environment with LaTeX support
    # The texlive bin directory must have been added to PATH (see above)
    spack external find --scope system texlive