Skip to content

Commit 2d0efda

Browse files
GordonSmithGordonSmith
committed
Merge pull request #1 from GordonSmith/REFACTOR
chore: Refactor work and squash for an initial release
2 parents 88a9fa7 + 777fbd2 commit 2d0efda

Some content is hidden

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

79 files changed

+6965
-745
lines changed

‎.clang-format‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.cmake-format‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎.github/workflows/install.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Install
33
on:
44
push:
55
branches:
6-
- master
6+
- trunk
77
- main
88
pull_request:
99
branches:
10-
- master
10+
- trunk
1111
- main
1212

1313
env:
@@ -20,20 +20,26 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v3
23+
with:
24+
submodules: recursive
2325

2426
- uses: actions/cache@v3
2527
with:
2628
path: "**/cpm_modules"
2729
key: ${{ github.workflow }}-cpm-modules-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
2830

31+
- name: install dependencies
32+
run: |
33+
sudo apt-get install ninja-build
34+
2935
- name: build and install library
3036
run: |
31-
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release
37+
cmake -G Ninja -S . -B build -DCMAKE_BUILD_TYPE=Release
3238
sudo cmake --build build --target install
3339
rm -rf build
3440
3541
- name: configure
36-
run: cmake -Stest -Bbuild -DTEST_INSTALLED_VERSION=1
42+
run: cmake -Stest -Bbuild -DTEST_INSTALLED_VERSION=ON
3743

3844
- name: build
3945
run: cmake --build build --config Debug -j4

‎.github/workflows/macos.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: MacOS
33
on:
44
push:
55
branches:
6-
- master
6+
- trunk
77
- main
88
pull_request:
99
branches:
10-
- master
10+
- trunk
1111
- main
1212

1313
env:
@@ -20,19 +20,27 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v3
23+
with:
24+
submodules: recursive
2325

2426
- uses: actions/cache@v3
2527
with:
2628
path: "**/cpm_modules"
2729
key: ${{ github.workflow }}-cpm-modules-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
2830

31+
- name: install dependencies
32+
run: |
33+
brew install ninja
34+
2935
- name: configure
30-
run: cmake -Stest -Bbuild -DCMAKE_BUILD_TYPE=Debug
36+
run: |
37+
cmake -G Ninja -S . -B build -DCMAKE_BUILD_TYPE=Debug
3138
3239
- name: build
33-
run: cmake --build build -j4
40+
run: cmake --build build --parallel
3441

3542
- name: test
43+
working-directory: build/test
3644
run: |
37-
cd build
38-
ctest --build-config Debug
45+
ctest
46+

‎.github/workflows/standalone.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Standalone
33
on:
44
push:
55
branches:
6-
- master
6+
- trunk
77
- main
88
pull_request:
99
branches:
10-
- master
10+
- trunk
1111
- main
1212

1313
env:

‎.github/workflows/style.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Style
33
on:
44
push:
55
branches:
6-
- master
6+
- trunk
77
- main
88
pull_request:
99
branches:
10-
- master
10+
- trunk
1111
- main
1212

1313
env:

‎.github/workflows/ubuntu.yml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Ubuntu
33
on:
44
push:
55
branches:
6-
- master
6+
- trunk
77
- main
88
pull_request:
99
branches:
10-
- master
10+
- trunk
1111
- main
1212

1313
env:
@@ -21,22 +21,34 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v3
24+
with:
25+
submodules: recursive
2426

2527
- uses: actions/cache@v3
2628
with:
2729
path: "**/cpm_modules"
2830
key: ${{ github.workflow }}-cpm-modules-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
2931

32+
- name: install dependencies
33+
run: |
34+
sudo apt-get install ninja-build
35+
3036
- name: configure
31-
run: cmake -Stest -Bbuild -DENABLE_TEST_COVERAGE=1 -DCMAKE_BUILD_TYPE=Debug
37+
run: |
38+
cmake -G Ninja -S . -B build -DENABLE_TEST_COVERAGE=1 -DCMAKE_BUILD_TYPE=Debug
39+
40+
- name: build-wasm
41+
run: ./test/wasm/build.sh
3242

3343
- name: build
34-
run: cmake --build build -j4
44+
run: cmake --build build --parallel
3545

3646
- name: test
3747
run: |
38-
cd build
39-
ctest --build-config Debug
48+
ctest --test-dir ./build/test
4049
41-
- name: collect code coverage
42-
run: bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
50+
- name: Upload coverage reports to Codecov
51+
uses: codecov/codecov-action@v4.0.1
52+
with:
53+
token: ${{ secrets.CODECOV_TOKEN }}
54+

‎.github/workflows/windows.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Windows
33
on:
44
push:
55
branches:
6-
- master
6+
- trunk
77
- main
88
pull_request:
99
branches:
10-
- master
10+
- trunk
1111
- main
1212

1313
env:
@@ -20,19 +20,23 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v3
23+
with:
24+
submodules: recursive
2325

2426
- uses: actions/cache@v3
2527
with:
2628
path: "**/cpm_modules"
2729
key: ${{ github.workflow }}-cpm-modules-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
2830

2931
- name: configure
30-
run: cmake -Stest -Bbuild
32+
run: |
33+
cmake -S . -B build
3134
3235
- name: build
33-
run: cmake --build build --config Debug -j4
36+
run: cmake --build build --config Debug --parallel
3437

3538
- name: test
39+
working-directory: build/test
3640
run: |
37-
cd build
38-
ctest --build-config Debug
41+
ctest
42+

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/build*
22
/.vscode
33
/cpm_modules
4-
.DS_Store
4+
/vcpkg_installed
5+
.DS_Store

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "vcpkg"]
2+
path = vcpkg
3+
url = https://github.com/microsoft/vcpkg.git
4+
[submodule "ref/component-model"]
5+
path = ref/component-model
6+
url = git@github.com:WebAssembly/component-model.git

0 commit comments

Comments
 (0)