From cf1e10c852c15e7a1214a80b1391f144a2d1c875 Mon Sep 17 00:00:00 2001
From: edoapra <edoardo.apra@gmail.com>
Date: Thu, 20 Mar 2025 14:50:56 -0700
Subject: [PATCH] flang-new-20 renamed to flang-20

---
 .github/workflows/github_actions.yml | 2 +-
 travis/build_env.sh                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml
index 468401e9bc..b9c5f44d0a 100644
--- a/.github/workflows/github_actions.yml
+++ b/.github/workflows/github_actions.yml
@@ -390,7 +390,7 @@ jobs:
             mpi_impl: mpich
             armci_network: MPI-TS
             nwchem_modules: "tinyqmpw"
-            fc: flang-new-20
+            fc: flang-20
           - os: ubuntu-latest
             experimental: true
             mpi_impl: mpich
diff --git a/travis/build_env.sh b/travis/build_env.sh
index 2379590df8..5c816eaeea 100755
--- a/travis/build_env.sh
+++ b/travis/build_env.sh
@@ -229,10 +229,10 @@ if [[ "$os" == "Linux" ]]; then
 	    icx -V
 	    $MYSUDO rm -rf $MKLROOT/lib/*sycl* || true
 	fi
-	if [[ "$FC" == 'flang-new-'* ]]; then
+	if [[ "$FC" == 'flang-new-'* || "$FC" == 'flang-'?? ]]; then
 	    wget https://apt.llvm.org/llvm.sh
 	    chmod +x llvm.sh
-	    llvm_ver=$(echo $FC | cut -d - -f 3)
+	    llvm_ver=$(echo "${FC##*-}")
 	    $MYSUDO ./llvm.sh $llvm_ver
 	    $MYSUDO apt-get install -y flang-$llvm_ver
 	fi