From cfea0ecf00ace055978c5851eb490e7dc080a36e Mon Sep 17 00:00:00 2001
From: Bryan Chan <bryan.chan@huawei.com>
Date: Wed, 15 May 2024 04:46:04 -0400
Subject: [PATCH] [workflows] Update CI to test release_18x, and stop testing
 release_16x

Also switch to the new name for the Ubuntu container we use for ARM64 testing.
---
 .github/workflows/build_flang.yml         | 6 +++---
 .github/workflows/build_flang_arm64.yml   | 4 ++--
 .github/workflows/build_flang_windows.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_flang.yml b/.github/workflows/build_flang.yml
index 82bdd6d3ae5..56d30f2f9e0 100644
--- a/.github/workflows/build_flang.yml
+++ b/.github/workflows/build_flang.yml
@@ -22,16 +22,16 @@ jobs:
         target: [X86]
         cc: [clang]
         version: [14, 15]
-        llvm_branch: [release_16x, release_17x]
+        llvm_branch: [release_17x, release_18x]
         include:
           - target: X86
             cc: gcc
             version: 12
-            llvm_branch: release_16x
+            llvm_branch: release_17x
           - target: X86
             cc: gcc
             version: 12
-            llvm_branch: release_17x
+            llvm_branch: release_18x
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
diff --git a/.github/workflows/build_flang_arm64.yml b/.github/workflows/build_flang_arm64.yml
index c10046a495d..dbc829f7bd7 100644
--- a/.github/workflows/build_flang_arm64.yml
+++ b/.github/workflows/build_flang_arm64.yml
@@ -20,13 +20,13 @@ jobs:
       build_path: /home/github
       install_prefix: /home/github/usr/local
     container:
-      image: ghcr.io/${{ github.repository_owner}}/ubuntu20-flang-${{ matrix.llvm_branch }}:latest
+      image: ghcr.io/${{ github.repository_owner}}/ubuntu-flang-${{ matrix.llvm_branch }}:latest
       credentials:
         username: github
     strategy:
       matrix:
         target: [AArch64]
-        llvm_branch: [release_16x, release_17x]
+        llvm_branch: [release_17x, release_18x]
 
     steps:
       - name: Check tools
diff --git a/.github/workflows/build_flang_windows.yml b/.github/workflows/build_flang_windows.yml
index a74ef4b73fa..b58a9436003 100644
--- a/.github/workflows/build_flang_windows.yml
+++ b/.github/workflows/build_flang_windows.yml
@@ -20,7 +20,7 @@ jobs:
         os:
           - windows-latest
           # - self-hosted
-        llvm_branch: [release_16x, release_17x]
+        llvm_branch: [release_17x, release_18x]
         include:
           - os: windows-latest
             arch: amd64