Skip to content

Commit 97a89f6

Browse files
authored
chore: cleanup dev install + remove blender dep (#328)
1 parent 529ab64 commit 97a89f6

File tree

6 files changed

+9
-86
lines changed

6 files changed

+9
-86
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,17 @@ jobs:
2020
build:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/cache@v4
24-
with:
25-
path: |
26-
~/.cache/bazelisk
27-
~/.cache/bazel-disk-cache
28-
key: ${{runner.os}}-bazel-cache
2923
- uses: actions/checkout@v4
3024
- run: bazel build --config=ci ...
3125
build-windows:
3226
runs-on: windows-latest
3327
steps:
3428
- name: bazel visual studio 17.6 workaround # https://github.com/bazelbuild/bazel/issues/18592
3529
run: Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\vcpkg" -Force -Recurse
36-
- uses: actions/cache@v4
37-
with:
38-
path: |
39-
/Users/runneradmin/AppData/Local/bazelisk
40-
/Users/runneradmin/.cache/bazel-disk-cache
41-
key: ${{runner.os}}-bazel-cache
4230
- uses: actions/checkout@v4
4331
- run: bazel build --config=ci //...
4432
check-dist:
4533
runs-on: ubuntu-latest
4634
steps:
47-
- uses: actions/cache@v4
48-
with:
49-
path: |
50-
~/.cache/bazelisk
51-
~/.cache/bazel-disk-cache
52-
key: ${{runner.os}}-bazel-cache
5335
- uses: actions/checkout@v4
5436
- run: ./CheckDist.sh

.github/workflows/release.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ jobs:
1515
common-dist:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/cache@v3
19-
with:
20-
path: |
21-
~/.cache/bazelisk
22-
~/.cache/bazel-disk-cache
23-
key: ${{runner.os}}-bazel-cache
2418
- uses: actions/checkout@v4
2519
- run: bazel run --config=ci //:copy_dist_include
2620
- run: bazel run --config=ci //:copy_dist_images
@@ -33,12 +27,6 @@ jobs:
3327
steps:
3428
- name: bazel visual studio 17.6 workaround # https://github.com/bazelbuild/bazel/issues/18592
3529
run: Remove-Item -Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\vcpkg" -Force -Recurse
36-
- uses: actions/cache@v3
37-
with:
38-
path: |
39-
/Users/runneradmin/AppData/Local/bazelisk
40-
/Users/runneradmin/.cache/bazel-disk-cache
41-
key: ${{runner.os}}-bazel-cache
4230
- uses: actions/checkout@v4
4331
- run: bazel run --config=ci //:copy_dist_bin
4432
- run: bazel run --config=ci //:copy_dist_codegen_plugins
@@ -50,12 +38,6 @@ jobs:
5038
linux-x64-binaries:
5139
runs-on: ubuntu-latest
5240
steps:
53-
- uses: actions/cache@v3
54-
with:
55-
path: |
56-
~/.cache/bazelisk
57-
~/.cache/bazel-disk-cache
58-
key: ${{runner.os}}-bazel-cache
5941
- uses: actions/checkout@v4
6042
- run: bazel run --config=ci //:copy_dist_bin
6143
- run: bazel run --config=ci //:copy_dist_codegen_plugins

BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ bzlws_copy(
1313
bzlws_copy(
1414
name = "copy_dist_images",
1515
srcs = [
16-
"@ecsact_logo//:ecsact-color",
17-
"@ecsact_logo//:ecsact-color150",
18-
"@ecsact_logo//:ecsact-color44",
16+
"@ecsact_logo//:ecsact-color.png",
17+
"@ecsact_logo//:ecsact-color150.png",
18+
"@ecsact_logo//:ecsact-color44.png",
1919
],
2020
out = "dist/images/{FILENAME}",
2121
force = True,

DevInstall.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

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

14+
# Simulate a release to set the correct version
15+
$Env:GITHUB_REF=$IncrementedVersion
16+
1417
. .\CopyDist.ps1
1518

1619
if ([System.Environment]::OSVersion.Platform -eq 'Unix') {

MODULE.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ bazel_dep(name = "yaml-cpp", version = "0.8.0")
2020
bazel_dep(name = "boost.dll", version = "1.83.0.bzl.2")
2121
bazel_dep(name = "boost.process", version = "1.83.0.bzl.2")
2222
bazel_dep(name = "bzlws", version = "0.2.0")
23+
bazel_dep(name = "ecsact_logo", version = "0.1.11")
2324

2425
bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True)
2526
bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
27+
2628
git_override(
2729
module_name = "hedron_compile_commands",
2830
commit = "204aa593e002cbd177d30f11f54cff3559110bb9",

WORKSPACE.bazel

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +0,0 @@
1-
workspace(name = "ecsact_sdk")
2-
3-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
4-
5-
http_file(
6-
name = "ecsact_rust_codegen_windows",
7-
downloaded_file_path = "ecsact_rust_codegen.dll",
8-
sha256 = "d35c8226f4953faf2d527d295c41adefd3215c61bad6f709e8ac812919c07daf",
9-
url = "https://github.com/ecsact-dev/ecsact_lang_rust/releases/download/0.1.0/ecsact_rust_codegen_bin.dll",
10-
)
11-
12-
http_file(
13-
name = "ecsact_rust_codegen_linux",
14-
downloaded_file_path = "ecsact_rust_codegen.so",
15-
sha256 = "cac4856b63217960b4194812119def5f9a7126483533cc24e847abe66a120536",
16-
url = "https://github.com/ecsact-dev/ecsact_lang_rust/releases/download/0.1.0/ecsact_rust_codegen_bin.so",
17-
)
18-
19-
http_archive(
20-
name = "rules_7zip",
21-
sha256 = "a1603959be68272506849a7ed91e7acd4c2b036a2df1b6d9112c7733a7d607db",
22-
strip_prefix = "rules_7zip-b064ada4b7878bc83be680fa55fcb16c893f594f",
23-
urls = ["https://github.com/zaucy/rules_7zip/archive/b064ada4b7878bc83be680fa55fcb16c893f594f.zip"],
24-
)
25-
26-
load("@rules_7zip//:setup.bzl", "setup_7zip")
27-
28-
setup_7zip()
29-
30-
http_archive(
31-
name = "rules_blender",
32-
integrity = "sha256-HKH9Y2wiL/EkVEFcaCZHT8ACW8SHX24UZ8EHEhwcI8w=",
33-
strip_prefix = "rules_blender-e5f5b1ef894fe4da7b3cbf85ca857b6fd3bdffba",
34-
urls = ["https://github.com/zaucy/rules_blender/archive/e5f5b1ef894fe4da7b3cbf85ca857b6fd3bdffba.zip"],
35-
)
36-
37-
load("@rules_blender//:repo.bzl", "blender_repository")
38-
39-
blender_repository(name = "blender", blender_version = "system", only_system_installed_blender = True)
40-
41-
http_archive(
42-
name = "ecsact_logo",
43-
sha256 = "1f4c838f694b7be9c9280ce6da17729d54bf04683f3d0015356e22a064a32185",
44-
strip_prefix = "logo-f2c8a487ea702a551e00044e766bc913c5e7c771",
45-
urls = ["https://github.com/ecsact-dev/logo/archive/f2c8a487ea702a551e00044e766bc913c5e7c771.zip"],
46-
)

0 commit comments

Comments
 (0)