From 590f83a591b4d5eac2acd57d374eaaa148f3184c Mon Sep 17 00:00:00 2001 From: Akuli Date: Tue, 14 Jan 2025 14:05:21 +0200 Subject: [PATCH] drop support --- .github/workflows/linux.yml | 8 ++------ .github/workflows/valgrind.yml | 2 +- Makefile.posix | 8 +------- README.md | 2 -- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 48b079ce..009141b7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - llvm-version: [11, 13, 14, 15] + llvm-version: [14, 15] # Testing all levels because there was a bug that only happened with -O1. (#224) opt-level: ['-O0', '-O1', '-O2', '-O3'] steps: @@ -70,11 +70,7 @@ jobs: steps: - uses: actions/checkout@v3 - run: sudo apt update - - run: sudo apt install -y llvm-{11,13,14,15}-dev clang-{11,13,14,15} make - - run: LLVM_CONFIG=llvm-config-11 ./doctest.sh - - run: make clean - - run: LLVM_CONFIG=llvm-config-13 ./doctest.sh - - run: make clean + - run: sudo apt install -y llvm-{14,15}-dev clang-{14,15} make - run: LLVM_CONFIG=llvm-config-14 ./doctest.sh - run: make clean - run: LLVM_CONFIG=llvm-config-15 ./doctest.sh diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 10a429bc..3f725c0e 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - llvm-version: [11, 13, 14, 15] + llvm-version: [14, 15] # Testing all levels because there was a bug that only happened with -O1. (#224) opt-level: ['-O0', '-O1', '-O2', '-O3'] fail-fast: false diff --git a/Makefile.posix b/Makefile.posix index d6a539da..67c6f295 100644 --- a/Makefile.posix +++ b/Makefile.posix @@ -8,12 +8,6 @@ LLVM_CONFIG ?= $(shell \ || which llvm-config-14 \ || which /usr/local/opt/llvm@14/bin/llvm-config \ || which /opt/homebrew/opt/llvm@14/bin/llvm-config \ - || which llvm-config-13 \ - || which /usr/local/opt/llvm@13/bin/llvm-config \ - || which /opt/homebrew/opt/llvm@13/bin/llvm-config \ - || which llvm-config-11 \ - || which /usr/local/opt/llvm@11/bin/llvm-config \ - || which /opt/homebrew/opt/llvm@11/bin/llvm-config \ || which /usr/pkg/libexec/libLLVM/llvm-config \ ) CFLAGS += $(shell $(LLVM_CONFIG) --cflags) @@ -39,7 +33,7 @@ config.h: echo "#define JOU_CLANG_PATH \"$(CC)\"" >> config.h config.jou: - @v=`$(LLVM_CONFIG) --version`; case "$$v" in 11.*|13.*|14.*|15.*) ;; *) echo "Error: Found unsupported LLVM version $$v. Only LLVM 11, 13, 14 and 15 are supported."; exit 1; esac + @v=`$(LLVM_CONFIG) --version`; case "$$v" in 14.*|15.*) ;; *) echo "Error: Found unsupported LLVM version $$v. Only LLVM 14 and 15 are supported."; exit 1; esac echo "# auto-generated by Makefile" > config.jou echo "def get_jou_clang_path() -> byte*:" >> config.jou echo " return \"$(CC)\"" >> config.jou diff --git a/README.md b/README.md index 00e4c248..90a739e9 100644 --- a/README.md +++ b/README.md @@ -119,8 +119,6 @@ The instructions for developing Jou are in [CONTRIBUTING.md](CONTRIBUTING.md). so you need to use a full path (or `$HOME`) instead. These LLVM/clang versions are supported: -- LLVM 11 with clang 11 -- LLVM 13 with clang 13 - LLVM 14 with clang 14 - LLVM 15 with clang 15