Skip to content

Commit 10c524f

Browse files
authored
update ci, enable xlings install feature (#20)
* update ci, enable xlings install feature * update ci * update ci
1 parent c3b65bc commit 10c524f

3 files changed

Lines changed: 17 additions & 16 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ jobs:
3636
3737
- name: Install Project Dependencies via Xlings
3838
run: |
39-
#xlings install
40-
cd ..
41-
xlings install xmake@3.0.7 gcc@15 openssl@3.1.5 -y
39+
xlings install
4240
4341
4442
- name: Build with xmake
4543
run: |
4644
xmake f -m release -vv -y
4745
xmake -j$(nproc)
4846
49-
- name: Verify d2x --version
50-
run: ./build/linux/x86_64/release/d2x --version
47+
- name: Verify d2x
48+
run: |
49+
./build/linux/x86_64/release/d2x --version
50+
./build/linux/x86_64/release/d2x new hello
5151
5252
build-macos:
5353
runs-on: macos-15
@@ -71,8 +71,7 @@ jobs:
7171
7272
- name: Install Project Dependencies via Xlings
7373
run: |
74-
cd ..
75-
xlings install xmake@3.0.7 llvm@20 -y
74+
xlings install
7675
clang --version
7776
7877
@@ -81,8 +80,10 @@ jobs:
8180
xmake f -m release --toolchain=llvm -vv -y
8281
xmake -j$(nproc)
8382
84-
- name: Verify d2x --version
85-
run: ./build/macosx/arm64/release/d2x --version
83+
- name: Verify d2x
84+
run: |
85+
./build/macosx/arm64/release/d2x --version
86+
./build/macosx/arm64/release/d2x new hello
8687
8788
build-windows:
8889
runs-on: windows-latest
@@ -100,5 +101,7 @@ jobs:
100101
xmake f -m release -y
101102
xmake -j$env:NUMBER_OF_PROCESSORS
102103
103-
- name: Verify d2x --version
104-
run: build\windows\x64\release\d2x.exe --version
104+
- name: Verify d2x
105+
run: |
106+
build\windows\x64\release\d2x.exe --version
107+
build\windows\x64\release\d2x.exe new hello

.github/workflows/release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ jobs:
3838
3939
- name: Install Project Dependencies via Xlings
4040
run: |
41-
cd ..
42-
xlings install xmake@3.0.7 gcc@15 openssl@3.1.5 -y
41+
xlings install
4342
4443
- name: Build with xmake
4544
run: |
@@ -80,8 +79,7 @@ jobs:
8079
8180
- name: Install Project Dependencies via Xlings
8281
run: |
83-
cd ..
84-
xlings install xmake@3.0.7 llvm@20 -y
82+
xlings install
8583
clang --version
8684
8785
- name: Build with xmake

.xlings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"xmake": "3.0.7",
44
"gcc": { "linux": "15.1.0" },
55
"openssl": { "linux": "3.1.5" },
6-
"llvm": { "macos": "20" }
6+
"llvm": { "macosx": "20" }
77
}
88
}

0 commit comments

Comments
 (0)