Skip to content

Commit 160cdb1

Browse files
authored
Merge pull request #412 from Pivot-Studio/feat/llvm-18
Feat/llvm 18
2 parents 759dd5b + 7b5fb73 commit 160cdb1

File tree

135 files changed

+5933
-1414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+5933
-1414
lines changed

.github/workflows/brew_release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
install: |
4141
lib.install Dir["./planglib"]
4242
lib.install "./libvm.a"
43+
lib.install "./libvm.dylib"
4344
bin.install "./plc"
4445
# Custom test command for your formula so you can run `brew test`.
4546
# Optional - string.
@@ -51,7 +52,7 @@ jobs:
5152
# Darwin AMD pre-existing path example: https://github.com/justintime50/myrepo/releases/download/v1.2.0/myrepo-1.2.0-darwin-amd64.tar.gz
5253
# Linux ARM pre-existing path example: https://github.com/justintime50/myrepo/releases/download/v1.2.0/myrepo-1.2.0-linux-arm64.tar.gz
5354
# Optional - booleans.
54-
target_darwin_amd64: true
55+
target_darwin_amd64: false
5556
target_darwin_arm64: true
5657
# target_linux_amd64: true
5758
# target_linux_arm64: false

.github/workflows/release.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,27 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
config:
28-
- os: "macOS-latest"
29-
dir: osx64
30-
arch: darwin-amd64
31-
artifacts: "plc"
32-
RUSTFLAGS: ""
33-
libvm: "libvm.a"
34-
- os: "self-hosted"
28+
- os: "macos-14"
3529
dir: osx64
3630
arch: darwin-arm64
3731
artifacts: "plc"
3832
RUSTFLAGS: ""
3933
libvm: "libvm.a"
34+
libvm_dylib: "libvm.dylib"
4035
- os: "ubuntu-latest"
4136
dir: linux64
4237
debdir: pivot-lang_0.1.0-1_amd64
4338
artifacts: "plc"
4439
arch: linux-amd64
4540
RUSTFLAGS: ""
4641
libvm: "libvm.a"
42+
libvm_dylib: "libvm.so"
4743
- os: "windows-latest"
4844
dir: win64
4945
artifacts: "plc.exe"
5046
RUSTFLAGS: "-Dwarnings -Ctarget-feature=+crt-static"
5147
libvm: "vm.lib"
48+
libvm_dylib: "vm.dll"
5249
arch: windows-amd64
5350
steps:
5451
- uses: actions/checkout@v4
@@ -116,6 +113,20 @@ jobs:
116113
dst = os.environ['OUT_DIR'] + "/" + artifact
117114
shutil.copy(src, dst)
118115
shell: python
116+
- name: Move libvm dylib
117+
env:
118+
ARTIFACTS: ${{ matrix.config.libvm_dylib }}
119+
OUT_DIR: ${{ matrix.config.dir }}
120+
OS: ${{ matrix.config.os }}
121+
run: |
122+
import os
123+
import shutil
124+
artifacts = os.environ['ARTIFACTS'].split()
125+
for artifact in artifacts:
126+
src = "target/release/%s" % artifact
127+
dst = os.environ['OUT_DIR'] + "/" + artifact
128+
shutil.copy(src, dst)
129+
shell: python
119130
- name: Move pllib
120131
env:
121132
ARTIFACTS: planglib

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
strategy:
6767
fail-fast: false
6868
matrix:
69-
os: ["ubuntu-latest", "windows-latest", "macOS-latest", "self-hosted"]
69+
os: ["ubuntu-latest", "windows-latest", "macos-14"]
7070
include:
7171
- RUSTFLAGS: "-Dwarnings"
7272
CARGO_INCREMENTAL: 1

.vscode/launch.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@
6666
"name": "debug lsp",
6767
"program": "plc",
6868
},
69+
{
70+
"type": "lldb",
71+
"request": "attach",
72+
"name": "debug repl",
73+
"pid": "${command:pickProcess}"
74+
},
6975
{
7076
"type": "pivot",
7177
"request": "launch",

0 commit comments

Comments
 (0)