Skip to content

Commit

Permalink
chore: cleanup Aspect Workflows before bazel-contrib hand-off
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeagle authored and gregmagolan committed Sep 2, 2024
1 parent edaafd2 commit 2f46f76
Show file tree
Hide file tree
Showing 26 changed files with 272 additions and 1,151 deletions.
10 changes: 4 additions & 6 deletions .aspect/cli/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
configure:
languages:
javascript: false
go: false
kotlin: false
protobuf: true
lint:
aspects:
- //tools/lint:linters.bzl%vale
- //tools/lint:linters.bzl%shellcheck
19 changes: 3 additions & 16 deletions .aspect/workflows/README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
# Aspect Workflows demonstration deployment
# Aspect Workflows

This deployment of [Aspect Workflows](https://www.aspect.build/workflows) is configured to run on GCP + CircleCI.
This deployment of [Aspect Workflows](https://www.aspect.build/workflows) is run on AWS + Buildkite.

You can see this Aspect Workflows demonstration deployment live at https://app.circleci.com/pipelines/github/aspect-build/bazel-lib.

The two components of the configuration in this repository are,

1. Aspect Workflows configuration yaml
1. CircleCI pipeline configuration

## Aspect Workflows configuration yaml

This is the [config.yaml](./config.yaml) file in this directory.

## CircleCI pipeline configuration

This is the [.circleci/config.yml](../../.circleci/config.yml) file.
You can see this Aspect Workflows demonstration deployment live at https://buildkite.com/aspect-build/bazel-lib. Learn more at https://aspect.build.
15 changes: 9 additions & 6 deletions .aspect/workflows/bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
common --remote_download_outputs=minimal
common --nobuild_runfile_links

common:aspect_rbe --extra_execution_platforms=@aspect_bazel_lib//platforms:x86_64_linux_remote
common:aspect_rbe --host_platform=@aspect_bazel_lib//platforms:x86_64_linux_remote
common:aspect_rbe --remote_executor=unix:///mnt/ephemeral/buildbarn/.cache/bb_clientd/grpc
common:aspect_rbe --genrule_strategy=remote,local
common:aspect_rbe --jobs=32
common:aspect_rbe --remote_timeout=3600
# remote execution
common --config=rbe

common:rbe --extra_execution_platforms=@aspect_bazel_lib//platforms:x86_64_linux_remote
common:rbe --host_platform=@aspect_bazel_lib//platforms:x86_64_linux_remote
common:rbe --remote_executor=unix:///mnt/ephemeral/buildbarn/.cache/bb_clientd/grpc
common:rbe --genrule_strategy=remote,local
common:rbe --jobs=32
common:rbe --remote_timeout=3600
122 changes: 7 additions & 115 deletions .aspect/workflows/config.yaml
Original file line number Diff line number Diff line change
@@ -1,125 +1,17 @@
queue: bazel-lib-default
bazel:
flags:
- --config=aspect_rbe
workspaces:
.:
tasks:
- test:
targets:
- //...
- -//lib/tests/coreutils:ls_test # Broken on workflows CI & RBE
- -//lib/tests/tar:test_dirs # Broken on workflows CI & RBE
- configure:
bazel:
flags: [] # TODO: Aspect CLI does not support --config for configure cmd
e2e/copy_action:
icon: bazel
tasks:
- test:
queue: bazel-lib-small
- format:
without: true
- gazelle:
without: true
- configure:
without: true
- buildifier:
without: true
- delivery:
without: true
e2e/copy_to_directory:
icon: bazel
tasks:
- test:
queue: bazel-lib-small
- format:
without: true
- gazelle:
without: true
- configure:
without: true
- buildifier:
without: true
- delivery:
without: true
e2e/coreutils:
icon: bazel
tasks:
- test:
queue: bazel-lib-small
- format:
without: true
- gazelle:
without: true
- configure:
without: true
- buildifier:
without: true
- delivery:
without: true
e2e/external_copy_to_directory:
icon: bazel
tasks:
- test:
queue: bazel-lib-small
- format:
without: true
- gazelle:
without: true
- configure:
without: true
- buildifier:
without: true
- delivery:
without: true
e2e/smoke:
icon: bazel
tasks:
- test:
queue: bazel-lib-small
- format:
without: true
- gazelle:
without: true
- configure:
without: true
- buildifier:
without: true
- delivery:
without: true
tasks:
- checkout:
update_strategy: rebase
- test:
hooks:
- type: before_task
command: vmstat -a -S M -t 1 2>&1 > vmstat.out &
- type: after_task
command: cat vmstat.out
artifact_paths:
- vmstat.out
targets:
- //...
- -//lib/tests/coreutils:ls_test # broken on RBE
- -//lib/tests/tar:test_dirs # broken on RBE
- format:
queue: bazel-lib-small
- lint:
- gazelle:
queue: bazel-lib-small
- configure:
queue: bazel-lib-small
- buildifier:
queue: bazel-lib-small
- delivery:
queue: bazel-lib-default
auto_deliver: true
rules:
- deliverable: 'attr("tags", "\bdeliverable\b", //...)'
condition:
branches:
- main
- deliverable:
- //tools/release:tools_delivery
condition:
only_on_change: false
branches:
- main
- warming:
queue: bazel-lib-warming
notifications:
github: {}
48 changes: 0 additions & 48 deletions .aspect/workflows/deps.bzl

This file was deleted.

4 changes: 2 additions & 2 deletions .bazeliskrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
BAZELISK_BASE_URL=https://github.com/aspect-build/aspect-cli/releases/download
USE_BAZEL_VERSION=aspect/5.9.25
BAZELISK_BASE_URL=https://static.aspect.build/aspect
USE_BAZEL_VERSION=aspect/2024.34.43
61 changes: 0 additions & 61 deletions .circleci/BUILD.bazel

This file was deleted.

Loading

0 comments on commit 2f46f76

Please sign in to comment.