Skip to content

chore: cleanup dev install + remove blender dep #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,17 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/cache@v4
with:
path: |
~/.cache/bazelisk
~/.cache/bazel-disk-cache
key: ${{runner.os}}-bazel-cache
- uses: actions/checkout@v4
- run: bazel build --config=ci ...
build-windows:
runs-on: windows-latest
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@v4
with:
path: |
/Users/runneradmin/AppData/Local/bazelisk
/Users/runneradmin/.cache/bazel-disk-cache
key: ${{runner.os}}-bazel-cache
- uses: actions/checkout@v4
- run: bazel build --config=ci //...
check-dist:
runs-on: ubuntu-latest
steps:
- uses: actions/cache@v4
with:
path: |
~/.cache/bazelisk
~/.cache/bazel-disk-cache
key: ${{runner.os}}-bazel-cache
- uses: actions/checkout@v4
- run: ./CheckDist.sh
18 changes: 0 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ bzlws_copy(
bzlws_copy(
name = "copy_dist_images",
srcs = [
"@ecsact_logo//:ecsact-color",
"@ecsact_logo//:ecsact-color150",
"@ecsact_logo//:ecsact-color44",
"@ecsact_logo//:ecsact-color.png",
"@ecsact_logo//:ecsact-color150.png",
"@ecsact_logo//:ecsact-color44.png",
],
out = "dist/images/{FILENAME}",
force = True,
Expand Down
5 changes: 4 additions & 1 deletion DevInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

param (
[Parameter(Mandatory)][SecureString] $CertPassword,
$CertPath = "$env:USERPROFILE\Documents\Certificates\EcsactDev.pfx"
$CertPath = [Environment]::GetFolderPath("MyDocuments") + "\Certificates\EcsactDev.pfx"
)

$ErrorActionPreference = 'Stop'
Expand All @@ -11,6 +11,9 @@ $GitTag = git describe --tags --abbrev=0
$GitTagSplit = $GitTag.Split(".")
$IncrementedVersion = $GitTagSplit[0] + "." + $GitTagSplit[1] + "." + (([int]$GitTagSplit[2]) + 1)

# Simulate a release to set the correct version
$Env:GITHUB_REF=$IncrementedVersion

. .\CopyDist.ps1

if ([System.Environment]::OSVersion.Platform -eq 'Unix') {
Expand Down
2 changes: 2 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
46 changes: 0 additions & 46 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
@@ -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"],
)