From 9d808cd1c4c6830e0a9fc4906c02915dd71ffbd8 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 4 Dec 2024 15:46:03 -0700 Subject: [PATCH 1/5] Add gh to global-workflow-env --- configs/common/packages_intel.yaml | 3 +++ .../repos/spack-stack/packages/global-workflow-env/package.py | 1 + 2 files changed, 4 insertions(+) diff --git a/configs/common/packages_intel.yaml b/configs/common/packages_intel.yaml index 15c38b784..6559c7c11 100644 --- a/configs/common/packages_intel.yaml +++ b/configs/common/packages_intel.yaml @@ -12,6 +12,9 @@ packages: gettext: require: - '@:0.21' + go: + require: + - '%gcc' gsibec: require: - '+mkl' diff --git a/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py b/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py index c80be09a0..4e855d298 100644 --- a/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py +++ b/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py @@ -28,6 +28,7 @@ class GlobalWorkflowEnv(BundlePackage): depends_on("bacio") depends_on("g2") depends_on("g2tmpl") + depends_on("gh") depends_on("w3nco") depends_on("w3emc") depends_on("sp", when="^ip@:4") From f3cb4ba0c098c8afda36d7dcc253d312383cd625 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 12 Dec 2024 23:28:13 -0700 Subject: [PATCH 2/5] finish adding changes to build gh with intel --- configs/common/packages_intel.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/common/packages_intel.yaml b/configs/common/packages_intel.yaml index 0ff0d6e9d..56c0dbbde 100644 --- a/configs/common/packages_intel.yaml +++ b/configs/common/packages_intel.yaml @@ -15,6 +15,12 @@ packages: go: require: - '%gcc' + go-bootstrap: + require: + - '%gcc' + gh: + require: + - '%gcc' gsibec: require: - '+mkl' From 403f00dd9e782e06aff91f1564bba76abdcefd2d Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 13 Dec 2024 15:16:33 -0700 Subject: [PATCH 3/5] add external grep to test --- .github/workflows/ubuntu-ci-x86_64-intel.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ubuntu-ci-x86_64-intel.yaml b/.github/workflows/ubuntu-ci-x86_64-intel.yaml index f391ce901..5a4f7f39d 100644 --- a/.github/workflows/ubuntu-ci-x86_64-intel.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-intel.yaml @@ -115,6 +115,14 @@ jobs: echo " - spec: qt@5.15.3" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml echo " prefix: /usr" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml + # Add external grep. + echo "" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml + echo " grep:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml + echo " buildable: False" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml + echo " externals:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml + echo " - spec: grep@3.11" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml + echo " prefix: /usr" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml + export -n SPACK_SYSTEM_CONFIG_PATH # For buildcaches From aa3a71a335784073d684499caf1eec09663460fc Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 13 Dec 2024 22:00:49 -0700 Subject: [PATCH 4/5] change grep to use 'external find' --- .github/workflows/ubuntu-ci-x86_64-intel.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ubuntu-ci-x86_64-intel.yaml b/.github/workflows/ubuntu-ci-x86_64-intel.yaml index 5a4f7f39d..2c24f824f 100644 --- a/.github/workflows/ubuntu-ci-x86_64-intel.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-intel.yaml @@ -61,6 +61,7 @@ jobs: --exclude bison --exclude openssl \ --exclude curl --exclude python spack external find --scope system sed + spack external find --scope system grep spack external find --scope system perl spack external find --scope system wget spack external find --scope system texlive @@ -115,14 +116,6 @@ jobs: echo " - spec: qt@5.15.3" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml echo " prefix: /usr" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml - # Add external grep. - echo "" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml - echo " grep:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml - echo " buildable: False" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml - echo " externals:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml - echo " - spec: grep@3.11" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml - echo " prefix: /usr" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml - export -n SPACK_SYSTEM_CONFIG_PATH # For buildcaches From 910d1965399bd17bd605c0960756790abde45368 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 20 Dec 2024 19:18:45 -0700 Subject: [PATCH 5/5] Update .github/workflows/ubuntu-ci-x86_64-intel.yaml --- .github/workflows/ubuntu-ci-x86_64-intel.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ubuntu-ci-x86_64-intel.yaml b/.github/workflows/ubuntu-ci-x86_64-intel.yaml index 9920b4a96..708efb581 100644 --- a/.github/workflows/ubuntu-ci-x86_64-intel.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-intel.yaml @@ -62,7 +62,6 @@ jobs: --exclude curl --exclude python spack external find --scope system grep spack external find --scope system sed - spack external find --scope system grep spack external find --scope system perl spack external find --scope system wget spack external find --scope system texlive