Skip to content

Commit 397fac4

Browse files
Set up CI filters for master-development workflow
1 parent a1ebf01 commit 397fac4

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

.factory/automation.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,12 @@ build:
3131
bazel run @vaticle_dependencies//factory/analysis:dependency-analysis
3232
correctness:
3333
build:
34-
# TODO: use default machine once we delete the non-Rust protocols
35-
machine: 4-core-16-gb
3634
image: vaticle-ubuntu-22.04
37-
#NPM packages can't be built under RBE
3835
command: |
3936
bazel build //...
4037
bazel run @vaticle_dependencies//tool/checkstyle:test-coverage
4138
bazel test $(bazel query 'kind(checkstyle_test, //...)') --test_output=errors
4239
build-dependency:
43-
# TODO: use default machine once we delete the non-Rust protocols
44-
machine: 4-core-16-gb
4540
image: vaticle-ubuntu-22.04
4641
command: |
4742
dependencies/maven/update.sh
@@ -50,7 +45,7 @@ build:
5045
deploy-crate-snapshot:
5146
filter:
5247
owner: vaticle
53-
branch: master
48+
branch: [master, development]
5449
dependencies: [build, build-dependency]
5550
image: vaticle-ubuntu-22.04
5651
command: |
@@ -59,7 +54,7 @@ build:
5954
deploy-npm-snapshot:
6055
filter:
6156
owner: vaticle
62-
branch: master
57+
branch: [master, development]
6358
dependencies: [build, build-dependency]
6459
image: vaticle-ubuntu-20.04
6560
command: |

dependencies/vaticle/repositories.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ def vaticle_dependencies():
2121
git_repository(
2222
name = "vaticle_dependencies",
2323
remote = "https://github.com/vaticle/dependencies",
24-
commit = "9632621e9e6381e192ba744ccb3f7447d0433c19", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
24+
commit = "a4a3bac9515fd51365e02f6aad762f67357e49a5", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
2525
)
26-

0 commit comments

Comments
 (0)