[bump to v18.1.3]

ldc-developers · Apr 13, 2024 · 3af7563 · 3af7563
1 parent 2f88dc1
commit 3af7563
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -210,7 +210,7 @@ install_ubuntu_prerequisites_template: &INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
 environment:
   CIRRUS_CLONE_DEPTH: 50
   HOST_LDC_VERSION: 1.31.0
-  LLVM_VERSION: 77babf83
+  LLVM_VERSION: 18.1.3
   GITHUB_TOKEN: ENCRYPTED[0955bd48c8d4e5391446fc0149d0719ad0b63df27ec9e6c180a5730a5b10dc7f28f09d1383423db158d21380ee2b022a]
 
 task:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ concurrency:
 
 env:
   CLANG_VERSION: 15.0.6
-  LLVM_VERSION: 77babf83
+  LLVM_VERSION: 18.1.3
 
 jobs:
   build-native:

diff --git a/.github/workflows/supported_llvm_versions.yml b/.github/workflows/supported_llvm_versions.yml
@@ -18,7 +18,8 @@ jobs:
           - job_name: Ubuntu 20.04, LDC-LLVM 18, latest LDC beta
             os: ubuntu-20.04
             host_dc: ldc-beta
-            llvm_version: 77babf83 # FIXME: no usable official package available yet
+            # FIXME: no usable official package available yet
+            llvm_version: https://github.com/ldc-developers/llvm-project/releases/download/ldc-v18.1.3/llvm-18.1.3-linux-x86_64.tar.xz
           - job_name: macOS 14, LLVM 17, latest LDC beta
             os: macos-14
             host_dc: ldc-beta
@@ -102,29 +103,26 @@ jobs:
             echo "Already cached"
             exit 0
           fi
+
           version='${{ matrix.llvm_version }}'
-          if [[ '${{ runner.os }}' == macOS ]]; then
-            if [[ "$version" =~ ^1[6-9]\. ]]; then
-              suffix='arm64-apple-darwin22.0'
+          if [[ "$version" =~ ^https:// ]]; then
+            url="$version"
+          else
+            if [[ '${{ runner.os }}' == macOS ]]; then
+              if [[ "$version" =~ ^1[6-9]\. ]]; then
+                suffix='arm64-apple-darwin22.0'
+              else
+                suffix='x86_64-apple-darwin'
+              fi
+            elif [[ "$version" =~ ^1[7-9]\. ]]; then
+              suffix='x86_64-linux-gnu-ubuntu-22.04' # LLVM 17+
+            elif [[ "$version" =~ ^1[3-6]\. ]]; then
+              suffix='x86_64-linux-gnu-ubuntu-18.04' # LLVM 13.0.1+
             else
-              suffix='x86_64-apple-darwin'
+              suffix='x86_64-linux-gnu-ubuntu-16.04'
             fi
-          elif [[ "$version" =~ ^1[7-9]\. ]]; then
-            suffix='x86_64-linux-gnu-ubuntu-22.04' # LLVM 17+
-          elif [[ "$version" =~ ^1[3-6]\. ]]; then
-            suffix='x86_64-linux-gnu-ubuntu-18.04' # LLVM 13.0.1+
-          else
-            suffix='x86_64-linux-gnu-ubuntu-16.04'
-          fi
-          if [[ "$version" = *.* ]]; then
+
             url="https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/clang+llvm-$version-$suffix.tar.xz"
-          else # short commit SHA of ldc-developers fork
-            if [[ '${{ runner.os }}' == Linux ]]; then
-              suffix='linux-x86_64'
-            elif [[ '${{ runner.os }}' == macOS ]]; then
-              suffix='osx-arm64'
-            fi
-            url="https://github.com/ldc-developers/llvm-project/releases/download/CI/llvm-$version-$suffix.tar.xz"
           fi
 
           curl -fL --retry 3 --max-time 300 -o llvm.tar.xz "$url"