diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 799c98c..e023155 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,15 +20,11 @@ jobs: build: runs-on: ubuntu-latest steps: - - run: sudo apt-get install blender python-is-python3 -y - uses: actions/checkout@v4 - run: bazel build --config=ci ... build-windows: runs-on: windows-latest steps: - - uses: Cyberboss/install-winget@v1 - - run: winget upgrade --accept-source-agreements - - run: winget install BlenderFoundation.Blender --disable-interactivity - name: bazel visual studio 17.6 workaround # https://github.com/bazelbuild/bazel/issues/18592 run: Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\vcpkg" -Force -Recurse - uses: actions/checkout@v4 @@ -36,6 +32,5 @@ jobs: check-dist: runs-on: ubuntu-latest steps: - - run: sudo apt-get install blender python-is-python3 -y - uses: actions/checkout@v4 - run: ./CheckDist.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23d44a1..38f6f3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,12 +15,6 @@ jobs: common-dist: runs-on: ubuntu-latest steps: - - uses: actions/cache@v3 - with: - path: | - ~/.cache/bazelisk - ~/.cache/bazel-disk-cache - key: ${{runner.os}}-bazel-cache - uses: actions/checkout@v4 - run: bazel run --config=ci //:copy_dist_include - run: bazel run --config=ci //:copy_dist_images @@ -33,12 +27,6 @@ jobs: steps: - name: bazel visual studio 17.6 workaround # https://github.com/bazelbuild/bazel/issues/18592 run: Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\vcpkg" -Force -Recurse - - uses: actions/cache@v3 - with: - path: | - /Users/runneradmin/AppData/Local/bazelisk - /Users/runneradmin/.cache/bazel-disk-cache - key: ${{runner.os}}-bazel-cache - uses: actions/checkout@v4 - run: bazel run --config=ci //:copy_dist_bin - run: bazel run --config=ci //:copy_dist_codegen_plugins @@ -50,12 +38,6 @@ jobs: linux-x64-binaries: runs-on: ubuntu-latest steps: - - uses: actions/cache@v3 - with: - path: | - ~/.cache/bazelisk - ~/.cache/bazel-disk-cache - key: ${{runner.os}}-bazel-cache - uses: actions/checkout@v4 - run: bazel run --config=ci //:copy_dist_bin - run: bazel run --config=ci //:copy_dist_codegen_plugins diff --git a/MODULE.bazel b/MODULE.bazel index a0e7ba1..bf80e56 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -20,9 +20,11 @@ bazel_dep(name = "yaml-cpp", version = "0.8.0") bazel_dep(name = "boost.dll", version = "1.83.0.bzl.2") bazel_dep(name = "boost.process", version = "1.83.0.bzl.2") bazel_dep(name = "bzlws", version = "0.2.0") +bazel_dep(name = "ecsact_logo", version = "0.1.11") bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True) bazel_dep(name = "hedron_compile_commands", dev_dependency = True) + git_override( module_name = "hedron_compile_commands", commit = "204aa593e002cbd177d30f11f54cff3559110bb9", diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 5854315..e69de29 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -1,46 +0,0 @@ -workspace(name = "ecsact_sdk") - -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") - -http_file( - name = "ecsact_rust_codegen_windows", - downloaded_file_path = "ecsact_rust_codegen.dll", - sha256 = "d35c8226f4953faf2d527d295c41adefd3215c61bad6f709e8ac812919c07daf", - url = "https://github.com/ecsact-dev/ecsact_lang_rust/releases/download/0.1.0/ecsact_rust_codegen_bin.dll", -) - -http_file( - name = "ecsact_rust_codegen_linux", - downloaded_file_path = "ecsact_rust_codegen.so", - sha256 = "cac4856b63217960b4194812119def5f9a7126483533cc24e847abe66a120536", - url = "https://github.com/ecsact-dev/ecsact_lang_rust/releases/download/0.1.0/ecsact_rust_codegen_bin.so", -) - -http_archive( - name = "rules_7zip", - sha256 = "a1603959be68272506849a7ed91e7acd4c2b036a2df1b6d9112c7733a7d607db", - strip_prefix = "rules_7zip-b064ada4b7878bc83be680fa55fcb16c893f594f", - urls = ["https://github.com/zaucy/rules_7zip/archive/b064ada4b7878bc83be680fa55fcb16c893f594f.zip"], -) - -load("@rules_7zip//:setup.bzl", "setup_7zip") - -setup_7zip() - -http_archive( - name = "rules_blender", - integrity = "sha256-HKH9Y2wiL/EkVEFcaCZHT8ACW8SHX24UZ8EHEhwcI8w=", - strip_prefix = "rules_blender-e5f5b1ef894fe4da7b3cbf85ca857b6fd3bdffba", - urls = ["https://github.com/zaucy/rules_blender/archive/e5f5b1ef894fe4da7b3cbf85ca857b6fd3bdffba.zip"], -) - -load("@rules_blender//:repo.bzl", "blender_repository") - -blender_repository(name = "blender", blender_version = "system", only_system_installed_blender = True) - -http_archive( - name = "ecsact_logo", - sha256 = "1f4c838f694b7be9c9280ce6da17729d54bf04683f3d0015356e22a064a32185", - strip_prefix = "logo-f2c8a487ea702a551e00044e766bc913c5e7c771", - urls = ["https://github.com/ecsact-dev/logo/archive/f2c8a487ea702a551e00044e766bc913c5e7c771.zip"], -)