Skip to content

Commit 2ed36e6

Browse files
Kelwanzaucy
andauthored
feat: 0.7.0 (#322)
Co-authored-by: Ezekiel Warren <[email protected]>
1 parent 9648deb commit 2ed36e6

File tree

9 files changed

+82
-92
lines changed

9 files changed

+82
-92
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
startup --windows_enable_symlinks
22
common --enable_bzlmod
33
common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main
4+
common --registry=https://raw.githubusercontent.com/zaucy/bazel-central-registry/add-curl-config2 # temporary
45
common --registry=https://raw.githubusercontent.com/bazelboost/registry/main
56
common --registry=https://bcr.bazel.build
67
build --enable_platform_specific_config
7-
build --incompatible_use_platforms_repo_for_constraints
88
build --incompatible_enable_cc_toolchain_resolution
99
build --incompatible_strict_action_env
1010
build --enable_runfiles

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
build:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/cache@v3
23+
- uses: actions/cache@v4
2424
with:
2525
path: |
2626
~/.cache/bazelisk
@@ -33,7 +33,7 @@ jobs:
3333
steps:
3434
- name: bazel visual studio 17.6 workaround # https://github.com/bazelbuild/bazel/issues/18592
3535
run: Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\vcpkg" -Force -Recurse
36-
- uses: actions/cache@v3
36+
- uses: actions/cache@v4
3737
with:
3838
path: |
3939
/Users/runneradmin/AppData/Local/bazelisk
@@ -44,7 +44,7 @@ jobs:
4444
check-dist:
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/cache@v3
47+
- uses: actions/cache@v4
4848
with:
4949
path: |
5050
~/.cache/bazelisk

.github/workflows/release.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
release-draft:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: softprops/action-gh-release@v1
13+
- uses: softprops/action-gh-release@v2
1414

1515
common-dist:
1616
runs-on: ubuntu-latest
@@ -30,7 +30,7 @@ jobs:
3030
- run: rm -rf dist/bin/ecsact_rtb.runfiles/boost_mp11_files/meta
3131
- run: rm -rf dist/bin/ecsact_rtb.runfiles/boost_mp11_files/tools
3232
- run: rm -rf dist/bin/ecsact_rtb.runfiles/boost_mp11_files/test
33-
- uses: actions/upload-artifact@v3
33+
- uses: actions/upload-artifact@v4
3434
with:
3535
name: common-dist
3636
path: dist
@@ -48,7 +48,7 @@ jobs:
4848
- uses: actions/checkout@v4
4949
- run: bazel run --config=ci //:copy_dist_bin
5050
- run: bazel run --config=ci //:copy_dist_codegen_plugins
51-
- uses: actions/upload-artifact@v3
51+
- uses: actions/upload-artifact@v4
5252
with:
5353
name: windows-x64-binaries
5454
path: dist
@@ -64,7 +64,7 @@ jobs:
6464
- uses: actions/checkout@v4
6565
- run: bazel run --config=ci //:copy_dist_bin
6666
- run: bazel run --config=ci //:copy_dist_codegen_plugins
67-
- uses: actions/upload-artifact@v3
67+
- uses: actions/upload-artifact@v4
6868
with:
6969
name: linux-x64-binaries
7070
path: dist
@@ -75,16 +75,16 @@ jobs:
7575
- common-dist
7676
- linux-x64-binaries
7777
steps:
78-
- uses: actions/download-artifact@v3
78+
- uses: actions/download-artifact@v4
7979
with:
8080
name: common-dist
81-
- uses: actions/download-artifact@v3
81+
- uses: actions/download-artifact@v4
8282
with:
8383
name: linux-x64-binaries
8484
# https://github.com/actions/upload-artifact#permission-loss
8585
- run: chmod +x bin/ecsact bin/ecsact_rtb bin/ecsact_lsp_server
8686
- run: tar -czf ecsact_sdk_${{github.ref_name}}_linux_x64.tar.gz bin include share
87-
- uses: actions/upload-artifact@v3
87+
- uses: actions/upload-artifact@v4
8888
with:
8989
name: linux-x64-archive
9090
path: ecsact_sdk_${{github.ref_name}}_linux_x64.tar.gz
@@ -96,17 +96,17 @@ jobs:
9696
- linux-x64-binaries
9797
steps:
9898
- uses: actions/checkout@v4
99-
- uses: actions/download-artifact@v3
99+
- uses: actions/download-artifact@v4
100100
with:
101101
name: common-dist
102-
- uses: actions/download-artifact@v3
102+
- uses: actions/download-artifact@v4
103103
with:
104104
name: linux-x64-binaries
105105
# https://github.com/actions/upload-artifact#permission-loss
106106
- run: chmod +x bin/ecsact bin/ecsact_rtb bin/ecsact_lsp_server
107107
- shell: pwsh
108108
run: ./CreateDeb.ps1 -Version ${{github.ref_name}}
109-
- uses: actions/upload-artifact@v3
109+
- uses: actions/upload-artifact@v4
110110
with:
111111
name: amd64-deb-package
112112
path: ecsact_sdk_${{github.ref_name}}_amd64.deb
@@ -117,16 +117,16 @@ jobs:
117117
- common-dist
118118
- windows-x64-binaries
119119
steps:
120-
- uses: actions/download-artifact@v3
120+
- uses: actions/download-artifact@v4
121121
with:
122122
name: common-dist
123-
- uses: actions/download-artifact@v3
123+
- uses: actions/download-artifact@v4
124124
with:
125125
name: windows-x64-binaries
126126
- run: >
127127
mv bin/ecsact_rtb.runfiles bin/ecsact_rtb.exe.runfiles &&
128128
zip -r ecsact_sdk_${{github.ref_name}}_windows_x64.zip bin include share
129-
- uses: actions/upload-artifact@v3
129+
- uses: actions/upload-artifact@v4
130130
with:
131131
name: windows-x64-archive
132132
path: ecsact_sdk_${{github.ref_name}}_windows_x64.zip
@@ -137,10 +137,10 @@ jobs:
137137
- release-draft
138138
- linux-x64-archive
139139
steps:
140-
- uses: actions/download-artifact@v3
140+
- uses: actions/download-artifact@v4
141141
with:
142142
name: linux-x64-archive
143-
- uses: softprops/action-gh-release@v1
143+
- uses: softprops/action-gh-release@v2
144144
with:
145145
fail_on_unmatched_files: true
146146
files: ecsact_sdk_${{github.ref_name}}_linux_x64.tar.gz
@@ -151,10 +151,10 @@ jobs:
151151
- release-draft
152152
- amd64-deb-package
153153
steps:
154-
- uses: actions/download-artifact@v3
154+
- uses: actions/download-artifact@v4
155155
with:
156156
name: amd64-deb-package
157-
- uses: softprops/action-gh-release@v1
157+
- uses: softprops/action-gh-release@v2
158158
with:
159159
fail_on_unmatched_files: true
160160
files: ecsact_sdk_${{github.ref_name}}_amd64.deb
@@ -165,10 +165,10 @@ jobs:
165165
- release-draft
166166
- windows-x64-archive
167167
steps:
168-
- uses: actions/download-artifact@v3
168+
- uses: actions/download-artifact@v4
169169
with:
170170
name: windows-x64-archive
171-
- uses: softprops/action-gh-release@v1
171+
- uses: softprops/action-gh-release@v2
172172
with:
173173
fail_on_unmatched_files: true
174174
files: ecsact_sdk_${{github.ref_name}}_windows_x64.zip
@@ -180,7 +180,7 @@ jobs:
180180
- release-upload-linux-x64-archive
181181
- release-upload-amd64-deb-package
182182
steps:
183-
- uses: softprops/action-gh-release@v1
183+
- uses: softprops/action-gh-release@v2
184184
with:
185185
name: ${{github.ref_name}}
186186
generate_release_notes: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# bazel
22
/bazel-*
33
/user.bazelrc
4+
*.bazel.lock
45

56
# https://github.com/hedronvision/bazel-compile-commands-extractor
67
/compile_commands.json

BUILD.bazel

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
load(":pkg.bzl", "pkg_executable")
2-
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
3-
load("@bzlws//:index.bzl", "bzlws_copy", "bzlws_extract")
1+
load("@bzlws//:index.bzl", "bzlws_copy")
42

53
bzlws_copy(
64
name = "copy_dist_bin",
@@ -36,13 +34,12 @@ bzlws_copy(
3634

3735
# keep sorted
3836
_plugins = [
39-
"@ecsact_lang_cpp//cpp_header_codegen:ecsact_cpp_header_codegen_bin",
40-
"@ecsact_lang_cpp//cpp_meta_header_codegen:ecsact_cpp_meta_header_codegen_bin",
41-
"@ecsact_lang_cpp//cpp_systems_header_codegen:ecsact_cpp_systems_header_codegen_bin",
42-
"@ecsact_lang_cpp//cpp_systems_source_codegen:ecsact_cpp_systems_source_codegen_bin",
43-
"@ecsact_lang_cpp//systems_header_codegen:ecsact_systems_header_codegen_bin",
44-
"@ecsact_lang_csharp//csharp_codegen:ecsact_csharp_codegen_bin",
45-
"@ecsact_lang_json//json_codegen:ecsact_json_codegen_bin",
37+
"@ecsact_lang_cpp//cpp_header_codegen:ecsact_cpp_header_codegen",
38+
"@ecsact_lang_cpp//cpp_systems_header_codegen:ecsact_cpp_systems_header_codegen",
39+
"@ecsact_lang_cpp//cpp_systems_source_codegen:ecsact_cpp_systems_source_codegen",
40+
"@ecsact_lang_cpp//systems_header_codegen:ecsact_systems_header_codegen",
41+
"@ecsact_lang_csharp//csharp_codegen:ecsact_csharp_codegen",
42+
"@ecsact_lang_json//json_codegen:ecsact_json_codegen",
4643
]
4744

4845
bzlws_copy(
@@ -52,6 +49,15 @@ bzlws_copy(
5249
"@platforms//os:linux": _plugins + ["@ecsact_rust_codegen_linux//file"],
5350
"//conditions:default": _plugins,
5451
}),
55-
out = "dist/share/ecsact/plugins/{BAZEL_LABEL_NAME}[:-4].{EXTNAME}",
52+
out = "dist/share/ecsact/plugins/{BAZEL_LABEL_NAME}.{EXTNAME}",
53+
force = True,
54+
)
55+
56+
bzlws_copy(
57+
name = "copy_dist_recipe_bundles",
58+
srcs = [
59+
"@ecsact_rt_entt",
60+
],
61+
out = "dist/share/ecsact/recipes/{FILENAME}",
5662
force = True,
5763
)

CopyDist.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_include
88
bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_images
99
bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_bin
1010
bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_codegen_plugins
11+
bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_recipe_bundles

MODULE.bazel

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,50 @@
11
module(name = "ecsact_sdk")
22

33
bazel_dep(name = "rules_cc", version = "0.0.9")
4-
bazel_dep(name = "platforms", version = "0.0.7")
5-
bazel_dep(name = "rules_pkg", version = "0.9.1")
6-
bazel_dep(name = "bazel_skylib", version = "1.4.2")
7-
bazel_dep(name = "ecsact_si_wasm", version = "0.1.1")
8-
bazel_dep(name = "rules_ecsact", version = "0.4.5")
9-
bazel_dep(name = "ecsact_rt_entt", version = "0.2.2")
10-
bazel_dep(name = "ecsact_codegen", version = "0.1.3")
11-
bazel_dep(name = "ecsact_parse", version = "0.3.3")
12-
bazel_dep(name = "ecsact_runtime", version = "0.5.4")
13-
bazel_dep(name = "ecsact_interpret", version = "0.5.3")
14-
bazel_dep(name = "ecsact_lang_cpp", version = "0.3.1")
15-
bazel_dep(name = "ecsact_cli", version = "0.2.3")
16-
bazel_dep(name = "ecsact_lsp_server", version = "0.2.0")
17-
bazel_dep(name = "ecsact_lang_json", version = "0.1.2")
18-
bazel_dep(name = "ecsact_lang_csharp", version = "0.1.2")
4+
bazel_dep(name = "platforms", version = "0.0.10")
5+
bazel_dep(name = "rules_pkg", version = "0.10.1")
6+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
7+
bazel_dep(name = "ecsact_si_wasm", version = "0.1.2")
8+
bazel_dep(name = "rules_ecsact", version = "0.5.3")
9+
bazel_dep(name = "ecsact_rt_entt", version = "0.3.3")
10+
bazel_dep(name = "ecsact_codegen", version = "0.3.1")
11+
bazel_dep(name = "ecsact_parse", version = "0.5.1")
12+
bazel_dep(name = "ecsact_runtime", version = "0.6.7")
13+
bazel_dep(name = "ecsact_interpret", version = "0.6.4")
14+
bazel_dep(name = "ecsact_lang_cpp", version = "0.4.5")
15+
bazel_dep(name = "ecsact_cli", version = "0.3.13")
16+
bazel_dep(name = "ecsact_lsp_server", version = "0.2.1")
17+
bazel_dep(name = "ecsact_lang_json", version = "0.1.4")
18+
bazel_dep(name = "ecsact_lang_csharp", version = "0.1.4")
19+
bazel_dep(name = "yaml-cpp", version = "0.8.0")
1920
bazel_dep(name = "boost.dll", version = "1.83.0.bzl.2")
2021
bazel_dep(name = "boost.process", version = "1.83.0.bzl.2")
2122

22-
# https://github.com/jbeder/yaml-cpp/issues/1229
23-
bazel_dep(name = "yaml-cpp")
23+
bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True)
24+
bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
2425
git_override(
25-
module_name = "yaml-cpp",
26-
commit = "37f1b8b8c9e5172ff3a79a3d5fdbb87f2994842b",
27-
remote = "https://github.com/jbeder/yaml-cpp",
26+
module_name = "hedron_compile_commands",
27+
commit = "204aa593e002cbd177d30f11f54cff3559110bb9",
28+
remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
29+
)
30+
31+
ecsact = use_extension("@rules_ecsact//ecsact:extensions.bzl", "ecsact", dev_dependency = True)
32+
ecsact.toolchain(use_ecsact_cli = True)
33+
use_repo(ecsact, "ecsact_toolchain")
34+
35+
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm", dev_dependency = True)
36+
llvm.toolchain(llvm_version = "17.0.6")
37+
use_repo(llvm, "llvm_toolchain")
38+
39+
register_toolchains(
40+
"@llvm_toolchain//:all",
41+
"@ecsact_toolchain//:all",
42+
dev_dependency = True,
2843
)
2944

3045
bazel_dep(name = "bzlws")
3146
git_override(
3247
module_name = "bzlws",
33-
commit = "b90ae6b38e351979cae2af355f55d2c68d997030",
48+
commit = "b7b10a115da356ec23b0cf0c697919baa7b7301c",
3449
remote = "https://github.com/zaucy/bzlws",
3550
)

WORKSPACE.bazel

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
44

55
http_file(
66
name = "ecsact_rust_codegen_windows",
7+
downloaded_file_path = "ecsact_rust_codegen.dll",
78
sha256 = "d35c8226f4953faf2d527d295c41adefd3215c61bad6f709e8ac812919c07daf",
89
url = "https://github.com/ecsact-dev/ecsact_lang_rust/releases/download/0.1.0/ecsact_rust_codegen_bin.dll",
9-
downloaded_file_path = "ecsact_rust_codegen.dll",
1010
)
1111

1212
http_file(
1313
name = "ecsact_rust_codegen_linux",
14+
downloaded_file_path = "ecsact_rust_codegen.so",
1415
sha256 = "cac4856b63217960b4194812119def5f9a7126483533cc24e847abe66a120536",
1516
url = "https://github.com/ecsact-dev/ecsact_lang_rust/releases/download/0.1.0/ecsact_rust_codegen_bin.so",
16-
downloaded_file_path = "ecsact_rust_codegen.so",
1717
)
1818

1919
http_archive(
@@ -44,36 +44,3 @@ http_archive(
4444
strip_prefix = "logo-f2c8a487ea702a551e00044e766bc913c5e7c771",
4545
urls = ["https://github.com/ecsact-dev/logo/archive/f2c8a487ea702a551e00044e766bc913c5e7c771.zip"],
4646
)
47-
48-
http_archive(
49-
name = "hedron_compile_commands",
50-
sha256 = "05f7fb324290c147ed29361a6a6fef7459c61816084fc07b3676a9639f4fcab7",
51-
strip_prefix = "bazel-compile-commands-extractor-eca42c63700fccdc49cf58177e0a96f0f6075a68",
52-
url = "https://github.com/hedronvision/bazel-compile-commands-extractor/archive/eca42c63700fccdc49cf58177e0a96f0f6075a68.tar.gz",
53-
)
54-
55-
load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")
56-
57-
hedron_compile_commands_setup()
58-
59-
http_archive(
60-
name = "com_grail_bazel_toolchain",
61-
sha256 = "afe9154ad85f0c0eb1f68b6036ad4e415ecf938b5e2bc17e4a76707452b48222",
62-
strip_prefix = "bazel-toolchain-ade23e0e37c5308162c012a4f4224459c1c4fa22",
63-
url = "https://github.com/grailbio/bazel-toolchain/archive/ade23e0e37c5308162c012a4f4224459c1c4fa22.zip",
64-
)
65-
66-
load("@com_grail_bazel_toolchain//toolchain:deps.bzl", "bazel_toolchain_dependencies")
67-
68-
bazel_toolchain_dependencies()
69-
70-
load("@com_grail_bazel_toolchain//toolchain:rules.bzl", "llvm_toolchain")
71-
72-
llvm_toolchain(
73-
name = "llvm_toolchain",
74-
llvm_version = "16.0.4",
75-
)
76-
77-
load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
78-
79-
llvm_register_toolchains()

pkg.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@rules_pkg//:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo", "PackageSymlinkInfo")
1+
load("@rules_pkg//pkg:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo", "PackageSymlinkInfo")
22

33
def _runfile_path(workspace_name, file):
44
path = file.short_path

0 commit comments

Comments
 (0)