From 4272fe5e85b504cd59df43f1cf463eb88e5fe7cb Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 20:46:47 +0100 Subject: [PATCH 01/17] Update Makefile to compile with LLVM C API --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 0be242aeb..d0dafd68c 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,12 @@ OS=$(shell uname) ifeq ($(OS), Darwin) LDFLAGS:=$(LDFLAGS) -liconv + CFLAGS:=$(CFLAGS) $(shell llvm-config --cflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM + LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) +endif +ifeq ($(OS), Linux) + CFLAGS:=$(CFLAGS) $(shell llvm-config --cflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM + LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) endif all: debug demo From 2b4010998d2b1992c0f7ffd6e5a5260886d36d4b Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 20:55:50 +0100 Subject: [PATCH 02/17] Up ci.yml --- .github/workflows/ci.yml | 4 ++-- Makefile | 4 ++-- src/llvm_backend.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 219dcebfd..c76aa5360 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM - run: sudo apt-get install llvm + run: sudo apt-get install llvm-11 llvm-11 - name: build odin run: make release - name: Odin run @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v1 - name: Download LLVM and setup PATH run: | - brew install llvm + brew install llvm@11 echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH TMP_PATH=$(xcrun --show-sdk-path)/user/include echo "CPATH=$TMP_PATH" >> $GITHUB_ENV diff --git a/Makefile b/Makefile index d0dafd68c..2c2c5f380 100644 --- a/Makefile +++ b/Makefile @@ -9,11 +9,11 @@ OS=$(shell uname) ifeq ($(OS), Darwin) LDFLAGS:=$(LDFLAGS) -liconv CFLAGS:=$(CFLAGS) $(shell llvm-config --cflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM - LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) + LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) -lLLVM-C endif ifeq ($(OS), Linux) CFLAGS:=$(CFLAGS) $(shell llvm-config --cflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM - LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) + LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) -lLLVM-C endif all: debug demo diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 6ed94661e..7a21ad885 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -2323,7 +2323,7 @@ void lb_debug_complete_types(lbModule *m) { for (unsigned i = 0; i < element_count; i++) { u64 offset_in_bits = i; i64 val = bt->BitSet.lower + cast(i64)i; - gb_snprintf(name, gb_count_of(name), "%lld", val); + gb_snprintf(name, gb_count_of(name), "%lld", cast(long long)val); elements[i] = LLVMDIBuilderCreateBitFieldMemberType( m->debug_builder, scope, From cde334ada3bc0f374d142c2e391eb12b6d3767ef Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 21:03:22 +0100 Subject: [PATCH 03/17] Modify flags in Makefile --- .github/workflows/ci.yml | 2 +- Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c76aa5360..cb259407d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM - run: sudo apt-get install llvm-11 llvm-11 + run: sudo apt-get install libllvm-11 llvm-11 - name: build odin run: make release - name: Odin run diff --git a/Makefile b/Makefile index 2c2c5f380..30d73e211 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,12 @@ OS=$(shell uname) ifeq ($(OS), Darwin) LDFLAGS:=$(LDFLAGS) -liconv - CFLAGS:=$(CFLAGS) $(shell llvm-config --cflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM - LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) -lLLVM-C + CFLAGS:=$(CFLAGS) $(shell llvm-config --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM + LDFLAGS:=$(LDFLAGS) $(shell llvm-config) -lLLVM-C endif ifeq ($(OS), Linux) - CFLAGS:=$(CFLAGS) $(shell llvm-config --cflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM - LDFLAGS:=$(LDFLAGS) $(shell llvm-config --ldflags --libs) -lLLVM-C + CFLAGS:=$(CFLAGS) $(shell llvm-config --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM + LDFLAGS:=$(LDFLAGS) $(shell llvm-config) -lLLVM-C endif all: debug demo From 0f9b0c2052b9af72c703c7128ae255d216b5695c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 21:04:38 +0100 Subject: [PATCH 04/17] Remove `libllvm-11` --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb259407d..5fb36863d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM - run: sudo apt-get install libllvm-11 llvm-11 + run: sudo apt-get install llvm-11 - name: build odin run: make release - name: Odin run From ad953c4670a397cc22ab513dc538837a539076b5 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 21:08:15 +0100 Subject: [PATCH 05/17] Add cast on `S_ISDIR` --- core/os/stat_unix.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/os/stat_unix.odin b/core/os/stat_unix.odin index 76cab69da..a3f25b5aa 100644 --- a/core/os/stat_unix.odin +++ b/core/os/stat_unix.odin @@ -61,7 +61,7 @@ _make_time_from_unix_file_time :: proc(uft: Unix_File_Time) -> time.Time { _fill_file_info_from_stat :: proc(fi: ^File_Info, s: OS_Stat) { fi.size = s.size; fi.mode = cast(File_Mode)s.mode; - fi.is_dir = S_ISDIR(s.mode); + fi.is_dir = S_ISDIR(u32(s.mode)); // NOTE(laleksic, 2021-01-21): Not really creation time, but closest we can get (maybe better to leave it 0?) fi.creation_time = _make_time_from_unix_file_time(s.status_change); From 240a568eb9bbde870d0640521139cc09bb40ca40 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 21:09:35 +0100 Subject: [PATCH 06/17] Update CI to run both old and new backends --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fb36863d..e7acf1e9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,9 @@ jobs: - name: build odin run: make release - name: Odin run - run: ./odin run examples/demo/demo.odin + run: | + ./odin run examples/demo/demo.odin + ./odin run examples/demo/demo.odin -llvm-api - name: Odin check run: ./odin check examples/demo/demo.odin -vet build_macOS: @@ -27,7 +29,9 @@ jobs: - name: build odin run: make release - name: Odin run - run: ./odin run examples/demo/demo.odin + run: | + ./odin run examples/demo/demo.odin + ./odin run examples/demo/demo.odin -llvm-api - name: Odin check run: ./odin check examples/demo/demo.odin -vet build_windows: From 184c686c7e939fc0e9110f49a75b4b2c9d1249b6 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 21:13:40 +0100 Subject: [PATCH 07/17] Add clang-11 for Linux; blank out threading_example on darwin --- .github/workflows/ci.yml | 2 +- examples/demo/demo.odin | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7acf1e9f..dd0376d96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM - run: sudo apt-get install llvm-11 + run: sudo apt-get install llvm-11 clang-11 - name: build odin run: make release - name: Odin run diff --git a/examples/demo/demo.odin b/examples/demo/demo.odin index 7119dc432..6817b15a4 100644 --- a/examples/demo/demo.odin +++ b/examples/demo/demo.odin @@ -1109,6 +1109,11 @@ prefix_table := [?]string{ }; threading_example :: proc() { + if ODIN_OS == "darwin" { + // TODO: Fix threads on darwin/macOS + return; + } + fmt.println("\n# threading_example"); { // Basic Threads From 748f094e15077ef2051b4d1236b510e6767a8d02 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 21:20:18 +0100 Subject: [PATCH 08/17] Add llvm-dev-11 to Linux CI (just testing) --- build.bat | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/build.bat b/build.bat index 761af6476..68a5414af 100644 --- a/build.bat +++ b/build.bat @@ -59,10 +59,37 @@ set linker_settings=%libs% %linker_flags% del *.pdb > NUL 2> NUL del *.ilk > NUL 2> NUL -cl %compiler_settings% "src\main.cpp" /link %linker_settings% -OUT:%exe_name% +cl %compiler_settings% "src\main.cpp" /link %linker_settings% -OUT:%exe_name% ^ + && odin check examples/demo + +rem odin run examples/demo -llvm-api + +rem odin build examples/demo -llvm-api -build-mode:llvm-ir -o:minimal + +rem odin build examples/demo -llvm-api -keep-temp-files -opt:2 + +rem cl %compiler_settings% "src\main.cpp" /link %linker_settings% -OUT:%exe_name% ^ +rem && odin doc examples/demo -doc-format -all-packages ^ +rem && odin run misc/tools/odin-doc-reader -strict-style -llvm-api + +rem odin run misc/tools/odin-doc-reader -strict-style -llvm-api + +rem odin build examples/demo -llvm-api -build-mode:assembly -target:darwin_arm64 +rem odin build examples/new_sync -llvm-api -target:linux_amd64 -define:ODIN_USE_PTHREADS=true +rem odin test core/path -llvm-api +rem odin test core/thread -llvm-api -target:windows_amd64 +rem odin test core/sync/sync2 -llvm-api -target:linux_amd64 -define:ODIN_USE_PTHREADS=true +rem odin test core/thread -llvm-api -target:linux_amd64 +rem odin test core/thread -llvm-api -target:linux_amd64 +rem odin check core/os/os2 -no-entry-point -vet +rem odin test core/sync/sync2 -llvm-api -target:windows_amd64 + +rem cl %compiler_settings% "src\main.cpp" /link %linker_settings% -OUT:%exe_name% +rem && odin run examples/new_sync -llvm-api + if %errorlevel% neq 0 goto end_of_build -if %release_mode% EQU 0 odin run examples/demo/demo.odin +rem if %release_mode% EQU 0 odin run examples/demo/demo.odin del *.obj > NUL 2> NUL From 6048d25d360fdb537258ffb6e0783a0482595fb7 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 21:26:14 +0100 Subject: [PATCH 09/17] Try llvm-config-11 --- .github/workflows/ci.yml | 2 +- build.bat | 31 ++----------------------------- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd0376d96..957770264 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM - run: sudo apt-get install llvm-11 clang-11 + run: sudo apt-get install llvm-11 llvm-config-11 clang-11 - name: build odin run: make release - name: Odin run diff --git a/build.bat b/build.bat index 68a5414af..761af6476 100644 --- a/build.bat +++ b/build.bat @@ -59,37 +59,10 @@ set linker_settings=%libs% %linker_flags% del *.pdb > NUL 2> NUL del *.ilk > NUL 2> NUL -cl %compiler_settings% "src\main.cpp" /link %linker_settings% -OUT:%exe_name% ^ - && odin check examples/demo - -rem odin run examples/demo -llvm-api - -rem odin build examples/demo -llvm-api -build-mode:llvm-ir -o:minimal - -rem odin build examples/demo -llvm-api -keep-temp-files -opt:2 - -rem cl %compiler_settings% "src\main.cpp" /link %linker_settings% -OUT:%exe_name% ^ -rem && odin doc examples/demo -doc-format -all-packages ^ -rem && odin run misc/tools/odin-doc-reader -strict-style -llvm-api - -rem odin run misc/tools/odin-doc-reader -strict-style -llvm-api - -rem odin build examples/demo -llvm-api -build-mode:assembly -target:darwin_arm64 -rem odin build examples/new_sync -llvm-api -target:linux_amd64 -define:ODIN_USE_PTHREADS=true -rem odin test core/path -llvm-api -rem odin test core/thread -llvm-api -target:windows_amd64 -rem odin test core/sync/sync2 -llvm-api -target:linux_amd64 -define:ODIN_USE_PTHREADS=true -rem odin test core/thread -llvm-api -target:linux_amd64 -rem odin test core/thread -llvm-api -target:linux_amd64 -rem odin check core/os/os2 -no-entry-point -vet -rem odin test core/sync/sync2 -llvm-api -target:windows_amd64 - -rem cl %compiler_settings% "src\main.cpp" /link %linker_settings% -OUT:%exe_name% -rem && odin run examples/new_sync -llvm-api - +cl %compiler_settings% "src\main.cpp" /link %linker_settings% -OUT:%exe_name% if %errorlevel% neq 0 goto end_of_build -rem if %release_mode% EQU 0 odin run examples/demo/demo.odin +if %release_mode% EQU 0 odin run examples/demo/demo.odin del *.obj > NUL 2> NUL From 5c26cf9d73b441af2cc49549e4fb299126f82717 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 21:58:44 +0100 Subject: [PATCH 10/17] Try `llvm-config-11` in the Makefil --- .github/workflows/ci.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 957770264..e7acf1e9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM - run: sudo apt-get install llvm-11 llvm-config-11 clang-11 + run: sudo apt-get install llvm-11 - name: build odin run: make release - name: Odin run diff --git a/Makefile b/Makefile index 30d73e211..5e55e8f5a 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ ifeq ($(OS), Darwin) LDFLAGS:=$(LDFLAGS) $(shell llvm-config) -lLLVM-C endif ifeq ($(OS), Linux) - CFLAGS:=$(CFLAGS) $(shell llvm-config --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM - LDFLAGS:=$(LDFLAGS) $(shell llvm-config) -lLLVM-C + CFLAGS:=$(CFLAGS) $(shell llvm-config-11 --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM + LDFLAGS:=$(LDFLAGS) $(shell llvm-config-11) -lLLVM-C endif all: debug demo From 4d000588587ff0ab2064347c72e58322b0d37739 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 24 Apr 2021 22:11:38 +0100 Subject: [PATCH 11/17] Try `clang-11` --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7acf1e9f..dd0376d96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM - run: sudo apt-get install llvm-11 + run: sudo apt-get install llvm-11 clang-11 - name: build odin run: make release - name: Odin run From fb6288a54e645cbe64e9e2c8b8c0d72b3baae65c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 15:48:54 +0100 Subject: [PATCH 12/17] Try specifying the specific libs on Linux --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5e55e8f5a..193d5ae52 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ GIT_SHA=$(shell git rev-parse --short HEAD) DISABLED_WARNINGS=-Wno-switch -Wno-pointer-sign -Wno-tautological-constant-out-of-range-compare -Wno-tautological-compare -Wno-macro-redefined LDFLAGS=-pthread -ldl -lm -lstdc++ -CFLAGS=-std=c++11 -DGIT_SHA=\"$(GIT_SHA)\" +CFLAGS=-std=c++14 -DGIT_SHA=\"$(GIT_SHA)\" CC=clang OS=$(shell uname) @@ -13,7 +13,7 @@ ifeq ($(OS), Darwin) endif ifeq ($(OS), Linux) CFLAGS:=$(CFLAGS) $(shell llvm-config-11 --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM - LDFLAGS:=$(LDFLAGS) $(shell llvm-config-11) -lLLVM-C + LDFLAGS:=$(LDFLAGS) $(shell llvm-config-11 --libs core native --system-libs) endif all: debug demo From 1387fd9047c13b7d009692798d02684743aaf1a7 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 15:52:24 +0100 Subject: [PATCH 13/17] Make -llvm-api run first before old backend on Linux --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd0376d96..5d7eb1336 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,10 @@ jobs: run: sudo apt-get install llvm-11 clang-11 - name: build odin run: make release + - name: Odin run -llvm-api + run: ./odin run examples/demo/demo.odin -llvm-api - name: Odin run - run: | - ./odin run examples/demo/demo.odin - ./odin run examples/demo/demo.odin -llvm-api + run: ./odin run examples/demo/demo.odin - name: Odin check run: ./odin check examples/demo/demo.odin -vet build_macOS: From ec2db568c14e7672d3837c820f4327b3360e3e6f Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 15:57:35 +0100 Subject: [PATCH 14/17] Update Makefile for macOS to be more "correct" with Linux --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 193d5ae52..478b4b840 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ OS=$(shell uname) ifeq ($(OS), Darwin) LDFLAGS:=$(LDFLAGS) -liconv CFLAGS:=$(CFLAGS) $(shell llvm-config --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM - LDFLAGS:=$(LDFLAGS) $(shell llvm-config) -lLLVM-C + LDFLAGS:=$(LDFLAGS) $(shell llvm-config-11 --libs core native --system-libs) endif ifeq ($(OS), Linux) CFLAGS:=$(CFLAGS) $(shell llvm-config-11 --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM From 60a2eaf666ddcb7cd882ff044a534a1b5459a432 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 18:04:07 +0100 Subject: [PATCH 15/17] Revert changes to macOS Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 478b4b840..e07e4c4ec 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ OS=$(shell uname) ifeq ($(OS), Darwin) LDFLAGS:=$(LDFLAGS) -liconv CFLAGS:=$(CFLAGS) $(shell llvm-config --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM - LDFLAGS:=$(LDFLAGS) $(shell llvm-config-11 --libs core native --system-libs) + LDFLAGS:=$(LDFLAGS) -lLLVM-C endif ifeq ($(OS), Linux) CFLAGS:=$(CFLAGS) $(shell llvm-config-11 --cxxflags --ldflags) -DLLVM_BACKEND_SUPPORT -DUSE_NEW_LLVM_ABI_SYSTEM From 041ff13672b0b65086540882b3369895064f75fe Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 18:06:29 +0100 Subject: [PATCH 16/17] Update CI for Linux --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d7eb1336..ea4d964aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Download LLVM - run: sudo apt-get install llvm-11 clang-11 + run: sudo apt-get install llvm-11 clang-11 llvm - name: build odin run: make release - name: Odin run -llvm-api From 1bdce19c18c1438b22f04030f64ed53b2208b9fa Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 18:44:05 +0100 Subject: [PATCH 17/17] Update nightly.yml to support `-llvm-api` --- .github/workflows/nightly.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1b6d82eaf..18141b736 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -49,9 +49,11 @@ jobs: steps: - uses: actions/checkout@v1 - name: (Linux) Download LLVM - run: sudo apt-get install llvm + run: sudo apt-get install llvm-11 clang-11 llvm - name: build odin run: make nightly + - name: Odin run -llvm-api + run: ./odin run examples/demo/demo.odin -llvm-api - name: Odin run run: ./odin run examples/demo/demo.odin - name: Copy artifacts @@ -78,6 +80,8 @@ jobs: echo "CPATH=$TMP_PATH" >> $GITHUB_ENV - name: build odin run: make nightly + - name: Odin run -llvm-api + run: ./odin run examples/demo/demo.odin -llvm-api - name: Odin run run: ./odin run examples/demo/demo.odin - name: Copy artifacts @@ -100,26 +104,26 @@ jobs: - uses: actions/setup-python@v2 with: python-version: '3.x' - + - name: Install B2 CLI shell: bash run: | python -m pip install --upgrade pip pip install --upgrade b2 - + - name: Display Python version run: python -c "import sys; print(sys.version)" - + - name: Download Windows artifacts uses: actions/download-artifact@v1 with: name: windows_artifacts - + - name: Download Ubuntu artifacts uses: actions/download-artifact@v1 with: name: ubuntu_artifacts - + - name: Download macOS artifacts uses: actions/download-artifact@v1 with: