Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementation of Lending Rework #69

Draft
wants to merge 21 commits into
base: staging
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'staging' into lend-rework
AjaniBilby committed May 17, 2023
commit db1e240cbb9af3902417623a2e4799f0f0faaa31
40 changes: 18 additions & 22 deletions .github/workflows/execution.yml
Original file line number Diff line number Diff line change
@@ -12,45 +12,41 @@ on:

jobs:
build-linux:

if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3

- name: Setup NodeJS
uses: actions/setup-node@v3
- name: Setup Ninja
uses: ashutoshvarma/setup-ninja@master
with:
node-version: 16

- name: Install NPM Dependencies
run: npm install --ignore-scripts

version: 1.10.0
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Cache LLVM and Clang
id: cache-llvm
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: "./lib/install"
key: llvm-14.0

key: llvm-15.0
- name: "Install LLVM and Clang"
uses: KyleMayes/install-llvm-action@v1
with:
version: "14.0"
version: "15.0"
directory: "./lib/install"

cached: ${{ steps.cache-llvm.outputs.cache-hit }}
- name: Symlink libclang.so (Linux)
run: sudo ln -s libclang-14.so.1 /lib/x86_64-linux-gnu/libclang.so
if: contains(matrix.os, 'ubuntu')
run: sudo ln -s libclang-15.so.1 /lib/x86_64-linux-gnu/libclang.so
working-directory: ${{ env.LLVM_PATH }}/lib

- name: Build UVC tools
run: |
cmake . -B build
cmake --build build
- name: Installing Dependencies
run: npm install --ignore-scripts

- name: Compiler Setup
run: npm run build:syntax
run: npm run build

- name: Compiler test
run: node ./compiler/test.js --action
@@ -64,6 +60,6 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- run: npm install
- run: node ./compiler/test.js --action
- run: node ./compiler/test.js --action
13 changes: 11 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -6,6 +6,9 @@ yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# CMake
CMakeFiles/*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

@@ -23,15 +26,21 @@ package-lock.json
# Build artifacts
install/
build/
.env


# Ignore uniview files
*.uv

# Ignore LLVM outputs
# Ignore Compilation outputs outputs
*.ll
*.bc
*.asm
*.s
*.bin
*.exe
*.app
*.out
*.out
*.o
*.lib
*.dll
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -2,4 +2,5 @@
path = lib/llvm
url = https://github.com/llvm/llvm-project
ignore = dirty
branch = release/14.x
branch = release/15.x
depth = 1
1 change: 1 addition & 0 deletions .vscode/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c_cpp_properties.json
4 changes: 3 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"recommendations": [
"revng.llvm-ir"
"revng.llvm-ir",
"streetsidesoftware.code-spell-checker",
"qupa-project.uniview"
]
}
96 changes: 90 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -2,47 +2,131 @@
"files.associations": {
"*.qp": "qupa",
"*.effect": "hlsl",
"*.frm": "vb",
"*.inc": "asp",
"*.uv": "uniview",
"xstring": "cpp",
"algorithm": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"barrier": "cpp",
"bit": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"cfenv": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"coroutine": "cpp",
"csetjmp": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cuchar": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"exception": "cpp",
"execution": "cpp",
"filesystem": "cpp",
"format": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"functional": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"iterator": "cpp",
"latch": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"random": "cpp",
"ranges": "cpp",
"ratio": "cpp",
"regex": "cpp",
"scoped_allocator": "cpp",
"semaphore": "cpp",
"set": "cpp",
"shared_mutex": "cpp",
"span": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"string": "cpp",
"strstream": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"utility": "cpp",
"valarray": "cpp",
"variant": "cpp",
"vector": "cpp",
"xfacet": "cpp",
"xhash": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xmemory": "cpp",
"xstddef": "cpp",
"xtr1common": "cpp",
"xutility": "cpp"
"xtree": "cpp",
"xutility": "cpp",
"__bit_reference": "cpp",
"__bits": "cpp",
"__config": "cpp",
"__errc": "cpp",
"__hash_table": "cpp",
"__locale": "cpp",
"__mutex_base": "cpp",
"__node_handle": "cpp",
"__split_buffer": "cpp",
"__std_stream": "cpp",
"__threading_support": "cpp",
"__tuple": "cpp",
"__verbose_abort": "cpp",
"propagate_const": "cpp",
"string_view": "cpp",
"*.ipp": "cpp"
},
"esbonio.server.enabled": true,
"cmake.configureOnOpen": false,
"cSpell.words": [
"uniview"
]
"editor.insertSpaces": false,
"files.eol": "\n"
}
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.