Skip to content

Commit

Permalink
chore: cleanup Workflows config
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan committed Dec 30, 2024
1 parent b44a6ec commit ddd5a6c
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 208 deletions.
66 changes: 0 additions & 66 deletions .aspect/workflows/README.md

This file was deleted.

8 changes: 8 additions & 0 deletions .aspect/workflows/bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,11 @@ common --remote_download_outputs=minimal
common --experimental_fetch_all_coverage_outputs
# https://github.com/bazelbuild/bazel/blob/e3e4d61b2c2b241d0426ea20143b8a07d6fadfcd/tools/test/collect_cc_coverage.sh#L30
common --test_env=COVERAGE_GCOV_PATH=/usr/bin/gcov

# remote execution
common:rbe --extra_execution_platforms=//bazel/platforms:x86_64_linux_remote
common:rbe --host_platform=//bazel/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
25 changes: 3 additions & 22 deletions .aspect/workflows/config.yaml
Original file line number Diff line number Diff line change
@@ -1,30 +1,11 @@
# See https://docs.aspect.build/v/workflows/config
---
# See https://docs.aspect.build/workflows/configuration
tasks:
- format:
queue: aspect-small
queue: aspect-medium
- buildifier:
queue: aspect-small
- gazelle:
queue: aspect-small
- configure:
queue: aspect-small
queue: aspect-medium
- test:
coverage: true
upload_test_logs: executed
- delivery:
auto_deliver: true
rules:
- deliverable: 'attr("tags", "\bdeliverable\b", //...)'
condition:
branches:
- main
- deliverable:
- //docs:docs_delivery
condition:
only_on_change: false
branches:
- main
- finalization:
queue: aspect-small
notifications:
Expand Down
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.51.11
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.1
7.4.0
31 changes: 0 additions & 31 deletions .github/workflows/new_issue.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,30 +1,11 @@
load("@aspect_bazel_lib//lib:copy_file.bzl", "copy_file")
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
load("@npm//:defs.bzl", "npm_link_all_packages")
load("//jest:defs.bzl", "jest_test")

npm_link_all_packages(name = "node_modules")

gazelle_binary(
name = "gazelle_bin",
languages = ["@bazel_skylib_gazelle_plugin//bzl"],
)

gazelle(
name = "gazelle",
gazelle = "gazelle_bin",
mode = "fix",
)

gazelle(
name = "gazelle.check",
gazelle = "gazelle_bin",
mode = "diff",
)

buildifier(
name = "buildifier",
exclude_patterns = ["./.git/*"],
Expand Down Expand Up @@ -74,10 +55,3 @@ copy_to_bin(
srcs = ["test_case8.jest.config.js"],
visibility = ["//visibility:public"],
)

bzl_library(
name = "internal_deps",
srcs = ["internal_deps.bzl"],
visibility = ["//visibility:public"],
deps = ["//jest/private:maybe"],
)
6 changes: 0 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ pre-commit install

Otherwise later tooling on CI may yell at you about formatting/linting violations.

## Updating BUILD files

Some targets are generated from sources.
Currently this is just the `bzl_library` targets.
Run `bazel run //:gazelle` to keep them up-to-date.

## Using this as a development dependency of other rules

You'll commonly find that you develop in another WORKSPACE, such as
Expand Down
2 changes: 0 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@ bazel_dep(name = "rules_nodejs", version = "6.2.0")

####### Dev dependencies ########

bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
bazel_dep(name = "gazelle", version = "0.36.0", dev_dependency = True, repo_name = "bazel_gazelle")
bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
12 changes: 0 additions & 12 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

############################################
# Gazelle, for generating bzl_library targets
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains(version = "1.19.3")

gazelle_dependencies()

# Test case 4 (see //jest/tests)
local_repository(
name = "case4",
Expand Down
12 changes: 12 additions & 0 deletions bazel/platforms/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
platform(
name = "x86_64_linux_remote",
constraint_values = [
"@platforms//os:linux",
"@platforms//cpu:x86_64",
],
exec_properties = {
"OSFamily": "Linux",
"container-image": "docker://ghcr.io/catthehacker/ubuntu:act-22.04@sha256:5f9c35c25db1d51a8ddaae5c0ba8d3c163c5e9a4a6cc97acd409ac7eae239448",
},
visibility = ["//visibility:public"],
)
17 changes: 0 additions & 17 deletions docs/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,3 @@ update_docs(
name = "update",
tags = ["skip-on-bazel6"], # slight docs difference in Bazel 6
)

# Demonstration delivery target for Aspect Workflows.
# In the future this could be wired up to push to a demonstration S3 bucket.
sh_binary(
name = "docs_delivery_only_on_change",
srcs = ["delivery.sh"],
data = glob(["*.md"]),
tags = ["deliverable"],
)

# Demonstration delivery target for Aspect Workflows.
# In the future this could be wired up to push to a demonstration S3 bucket.
sh_binary(
name = "docs_delivery",
srcs = ["delivery.sh"],
data = glob(["*.md"]),
)
5 changes: 0 additions & 5 deletions docs/delivery.sh

This file was deleted.

18 changes: 0 additions & 18 deletions internal_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,6 @@ load("//jest/private:maybe.bzl", http_archive = "maybe_http_archive")

def rules_jest_internal_deps():
"Fetch deps needed for local development"
http_archive(
name = "io_bazel_rules_go",
sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip"],
)

http_archive(
name = "bazel_gazelle",
integrity = "sha256-dd8ojEsxyB61D1Hi4U9HY8t1SNquEmgXJHBkY3/Z6mI=",
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz"],
)

http_archive(
name = "bazel_skylib_gazelle_plugin",
sha256 = "747addf3f508186234f6232674dd7786743efb8c68619aece5fb0cac97b8f415",
urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-gazelle-plugin-1.5.0.tar.gz"],
)

http_archive(
name = "io_bazel_stardoc",
sha256 = "62bd2e60216b7a6fec3ac79341aa201e0956477e7c8f6ccc286f279ad1d96432",
Expand Down

0 comments on commit ddd5a6c

Please sign in to comment.