From 75e2e7d09e68a0caba4eea2dba7f662b6ecee5bc Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Thu, 31 Mar 2022 16:54:17 -0700
Subject: [PATCH] CI: NVHPC New Apt Repo (#2687)

Update the NVHPC install instructions to the latest and greatest.
Fix failing CI (dependency install).
---
 .github/workflows/cuda.yml                    |  8 ++---
 .../dependencies/dependencies_nvhpc21-11.sh   | 29 +++++++++++++++++++
 .../dependencies/dependencies_nvhpc21-9.sh    | 29 -------------------
 3 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100755 .github/workflows/dependencies/dependencies_nvhpc21-11.sh
 delete mode 100755 .github/workflows/dependencies/dependencies_nvhpc21-9.sh

diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
index db124ca238c..a61a425910e 100644
--- a/.github/workflows/cuda.yml
+++ b/.github/workflows/cuda.yml
@@ -73,17 +73,17 @@ jobs:
         cmake --build build -j 2
 
   # Build libamrex and all tests with NVHPC (recent supported)
-  tests-nvhpc21-9-nvcc:
-    name: NVHPC@21.9 NVCC/NVC++ C++17 Release [tests]
+  tests-nvhpc21-11-nvcc:
+    name: NVHPC@21.11 NVCC/NVC++ C++17 Release [tests]
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Dependencies
-      run: .github/workflows/dependencies/dependencies_nvhpc21-9.sh
+      run: .github/workflows/dependencies/dependencies_nvhpc21-11.sh
     - name: Build & Install
       run: |
         source /etc/profile.d/modules.sh
-        module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/21.9
+        module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/21.11
 
         which nvcc || echo "nvcc not in PATH!"
         which nvc++ || echo "nvc++ not in PATH!"
diff --git a/.github/workflows/dependencies/dependencies_nvhpc21-11.sh b/.github/workflows/dependencies/dependencies_nvhpc21-11.sh
new file mode 100755
index 00000000000..c6c827f9927
--- /dev/null
+++ b/.github/workflows/dependencies/dependencies_nvhpc21-11.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#
+# Copyright 2021-2022 The AMReX Community
+#
+# Author: Axel Huebl
+# License: BSD-3-Clause-LBNL
+
+set -eu -o pipefail
+
+sudo apt-get -qqq update
+sudo apt-get install -y \
+    build-essential     \
+    ca-certificates     \
+    cmake               \
+    environment-modules \
+    gnupg               \
+    pkg-config          \
+    wget
+
+echo 'deb [trusted=yes] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | \
+  sudo tee /etc/apt/sources.list.d/nvhpc.list
+sudo apt-get update -y
+sudo apt-get install -y --no-install-recommends nvhpc-21-11
+
+# things should reside in /opt/nvidia/hpc_sdk now
+
+# activation via:
+#   source /etc/profile.d/modules.sh
+#   module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/21.11
diff --git a/.github/workflows/dependencies/dependencies_nvhpc21-9.sh b/.github/workflows/dependencies/dependencies_nvhpc21-9.sh
deleted file mode 100755
index 633e62b1e4a..00000000000
--- a/.github/workflows/dependencies/dependencies_nvhpc21-9.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright 2021 Axel Huebl
-#
-# License: BSD-3-Clause-LBNL
-
-set -eu -o pipefail
-
-sudo apt-get -qqq update
-sudo apt-get install -y \
-    build-essential     \
-    ca-certificates     \
-    cmake               \
-    environment-modules \
-    gnupg               \
-    pkg-config          \
-    wget
-
-wget -q https://developer.download.nvidia.com/hpc-sdk/21.9/nvhpc-21-9_21.9_amd64.deb \
-        https://developer.download.nvidia.com/hpc-sdk/21.9/nvhpc-2021_21.9_amd64.deb
-sudo apt-get update
-sudo apt-get install -y ./nvhpc-21-9_21.9_amd64.deb ./nvhpc-2021_21.9_amd64.deb
-rm -rf ./nvhpc-21-9_21.9_amd64.deb ./nvhpc-2021_21.9_amd64.deb
-
-# things should reside in /opt/nvidia/hpc_sdk now
-
-# activation via:
-#   source /etc/profile.d/modules.sh
-#   module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/21.9