Remove Makefile (#637)

terralang · Aug 23, 2023 · f6fe53f · f6fe53f
1 parent 6c97b40
commit f6fe53f
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 506 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -12,14 +12,8 @@ freebsd_task:
       # LLVM_VERSION: 14
       LLVM_VERSION: 15
       LLVM_VERSION: 16
-    matrix:
-      # USE_CMAKE: 0
-      USE_CMAKE: 1
   install_script: pkg install -y bash coreutils cmake gmake llvm$LLVM_VERSION
   script: |
-    export LLVM_CONFIG=llvm-config$LLVM_VERSION
-    export CLANG=clang$LLVM_VERSION
-    export MAKE=gmake
     export CC=cc
     bash travis.sh
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,38 +15,20 @@ jobs:
         env:
           CHECK_CLANG_FORMAT: 1
   build:
-    name: Build (${{ matrix.os }}, llvm-${{ matrix.llvm }}, cmake=${{ matrix.cmake }}, cuda=${{ matrix.cuda }}, ${{ matrix.lua }})
+    name: Build (${{ matrix.os }}, llvm-${{ matrix.llvm }}, cuda=${{ matrix.cuda }}, ${{ matrix.lua }})
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ['ubuntu-22.04', 'macos-11', 'windows-2022']
+        os: ['macos-11', 'windows-2022']
         llvm: ['11', '12', '13', '14', '15', '16']
-        cmake: ['0', '1']
         cuda: ['0', '1']
         lua: ['luajit', 'moonjit']
         exclude:
-          # Linux: exclude LLVM 11-13, 15-16, cmake
-          # Note: CMake configurations are tested in Docker
-          - os: 'ubuntu-22.04'
-            llvm: '11'
-          - os: 'ubuntu-22.04'
-            llvm: '12'
-          - os: 'ubuntu-22.04'
-            llvm: '13'
-          - os: 'ubuntu-22.04'
-            llvm: '15'
-          - os: 'ubuntu-22.04'
-            llvm: '16'
-          - os: 'ubuntu-22.04'
-            cmake: '1'
-
-          # macOS: exclude make, cuda
-          - os: 'macos-11'
-            cmake: '0'
+          # macOS: exclude cuda
           - os: 'macos-11'
             cuda: '1'
 
-          # Windows: exclude LLVM 12-16, make
+          # Windows: exclude LLVM 12-16
           - os: 'windows-2022'
             llvm: '12'
           - os: 'windows-2022'
@@ -57,12 +39,6 @@ jobs:
             llvm: '15'
           - os: 'windows-2022'
             llvm: '16'
-          - os: 'windows-2022'
-            cmake: '0'
-
-          # Moonjit requires CMake
-          - cmake: '0'
-            lua: 'moonjit'
 
           # CUDA: only LLVM 11
           - llvm: '12'
@@ -92,9 +68,7 @@ jobs:
       - run: ./travis.sh
         shell: bash
         env:
-          LLVM_CONFIG: llvm-config-${{ matrix.llvm }}
-          CLANG: clang-${{ matrix.llvm }}
-          USE_CMAKE: ${{ matrix.cmake }}
+          LLVM_VERSION: ${{ matrix.llvm }}
           USE_CUDA: ${{ matrix.cuda }}
           STATIC_LLVM: 1
           STATIC_LUAJIT: 1

diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@
 ## Removed features
 
   * Removed support for LLVM <= 10
+  * Removed the long-deprecated Makefile build
 
 # Release 1.1.1 (2023-08-22)