From b826c2db999346502810ec1dac88b323e3e0aa19 Mon Sep 17 00:00:00 2001 From: Appu Goundan Date: Fri, 27 Feb 2026 20:59:54 +0000 Subject: [PATCH] Buildifer fixes and remove unused config Signed-off-by: Appu Goundan --- .github/workflows/buildifier.yaml | 21 +----- .github/workflows/update-temurin-packages.yml | 67 ------------------- .travis.yml | 30 --------- BUILD | 8 +-- cc/cc.bzl | 2 +- examples/nonroot/BUILD | 4 +- java/BUILD | 2 +- java/java.bzl | 2 +- knife | 8 ++- nodejs/BUILD | 2 +- nodejs/nodejs.bzl | 2 +- private/oci/defs.bzl | 4 +- private/oci/rust_image.bzl | 2 +- private/pkg/test/oci_image/BUILD.bazel | 2 +- python3/BUILD | 4 +- 15 files changed, 24 insertions(+), 136 deletions(-) delete mode 100644 .github/workflows/update-temurin-packages.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/buildifier.yaml b/.github/workflows/buildifier.yaml index 1eeb22abb..f2defda4a 100644 --- a/.github/workflows/buildifier.yaml +++ b/.github/workflows/buildifier.yaml @@ -26,24 +26,5 @@ jobs: go install github.com/bazelbuild/buildtools/buildifier@3.2.0 - name: Run buildifier - shell: bash run: | - buildifier -mode=fix $(find . -name 'BUILD*' -o -name 'WORKSPACE*' -o -name '*.bzl' -type f) - - - name: Verify buildifier - shell: bash - run: | - # From: https://backreference.org/2009/12/23/how-to-match-newlines-in-sed/ - # This is to leverage this workaround: - # https://github.com/actions/toolkit/issues/193#issuecomment-605394935 - function urlencode() { - sed ':begin;$!N;s/\n/%0A/;tbegin' - } - if [[ $(git diff-index --name-only HEAD --) ]]; then - for x in $(git diff-index --name-only HEAD --); do - echo "::error file=$x::Please run buildifier.%0A$(git diff $x | urlencode)" - done - echo "${{ github.repository }} is out of style. Please run buildifier." - exit 1 - fi - echo "${{ github.repository }} is formatted correctly." + ./knife lint --check diff --git a/.github/workflows/update-temurin-packages.yml b/.github/workflows/update-temurin-packages.yml deleted file mode 100644 index 764882dde..000000000 --- a/.github/workflows/update-temurin-packages.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: update-temurin-packages -on: - # will send emails to last editor of this cron syntax (distroless-bot) - schedule: - - cron: "35 20 * * *" - # allow this workflow to be manually run - workflow_dispatch: - -permissions: - contents: read - -jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - - steps: - - uses: actions/checkout@v6 - - - name: Update snapshots - run: ./knife update-java-archives - - - name: Check for changes - run: | - git status - if [[ $(git status --porcelain) ]]; then - echo "DISTROLESS_DIFF=true" >> "$GITHUB_ENV" - else - echo "No changes detected" - exit 0 - fi - - - name: Run update lockfile - if: env.DISTROLESS_DIFF - run: bazel mod deps --lockfile_mode=update - - - name: Create commits - if: env.DISTROLESS_DIFF - run: | - git checkout -b update-java-archives - - # Set identity. - git config --global user.email "distroless-bot@google.com" - git config --global user.name "Distroless Bot" - - # Commit changes - git add . - git commit -s -m "Bumping temurin archives to latest stable versions" - git push --force origin HEAD - - - name: Create Pull Request - if: env.DISTROLESS_DIFF - env: - GH_TOKEN: ${{ secrets.ACTIONS_TOKEN }} - run: | - BODY_FILE=$(mktemp) - if ! OUTPUT=$(gh pr create -B main -H update-java-archives --fill 2>&1) ; then - echo $OUTPUT - if [[ "${OUTPUT}" =~ "already exists" ]]; then - echo "PR already exists and it was updated. Ending successfully"; - exit 0; - else - exit 1; - fi - fi diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 39e5180bb..000000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -dist: bionic -# Not technically required but suppresses 'Ruby' in Job status message. -# This also lets us leverage GOARCH below. -language: go -jobs: - include: - - arch: amd64 - env: CPU=k8 - - arch: arm64 - env: CPU=aarch64 - -install: - - export PATH=$PATH:$HOME/bin && mkdir -p $HOME/bin - - eval $(go env) - # install bazelisk as bazel to install the appropriate bazel version - - wget https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-${GOARCH} && chmod +x bazelisk-linux-${GOARCH} && mv bazelisk-linux-${GOARCH} $HOME/bin/bazel - -script: - - bazel clean --curses=no - - bazel build --cpu=${CPU} --curses=no //package_manager:dpkg_parser.par - - bazel build --cpu=${CPU} --curses=no //... - # Build all targets tagged with our architecture: - - bazel build --cpu=${CPU} --curses=no $(bazel query 'attr("tags", "'${GOARCH}'", "//...")') - # Run all tests not tagged as "manual": - - bazel test --cpu=${CPU} --curses=no --test_output=errors --test_timeout=900 //... - # Run all tests tagged with our architecture: - - bazel test --cpu=${CPU} --curses=no --test_output=errors --test_timeout=900 $(bazel query 'attr("tags", "'${GOARCH}'", "//...")') - -notifications: - email: false diff --git a/BUILD b/BUILD index c586b9246..9063b4f90 100644 --- a/BUILD +++ b/BUILD @@ -1,11 +1,11 @@ -load("//private/oci:defs.bzl", "sign_and_push_all") -load("//private/tools/lifecycle:defs.bzl", "attach_lifecycle_tags") -load("//static:config.bzl", "STATIC_ARCHITECTURES", "STATIC_DISTROS") load("//base:config.bzl", "BASE_ARCHITECTURES", "BASE_DISTROS") load("//cc:config.bzl", "CC_ARCHITECTURES", "CC_DISTROS") -load("//nodejs:config.bzl", "NODEJS_ARCHITECTURES", "NODEJS_DISTROS", "NODEJS_MAJOR_VERSIONS") load("//java:config.bzl", "JAVA_ARCHITECTURES", "JAVA_DISTROS", "JAVA_MAJOR_VERSIONS") +load("//nodejs:config.bzl", "NODEJS_ARCHITECTURES", "NODEJS_DISTROS", "NODEJS_MAJOR_VERSIONS") +load("//private/oci:defs.bzl", "sign_and_push_all") +load("//private/tools/lifecycle:defs.bzl", "attach_lifecycle_tags") load("//python3:config.bzl", "PYTHON_ARCHITECTURES", "PYTHON_DISTROS") +load("//static:config.bzl", "STATIC_ARCHITECTURES", "STATIC_DISTROS") package(default_visibility = ["//visibility:public"]) diff --git a/cc/cc.bzl b/cc/cc.bzl index de728c8bc..c1d387bf9 100644 --- a/cc/cc.bzl +++ b/cc/cc.bzl @@ -1,6 +1,6 @@ load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index") -load("//private/util:deb.bzl", "deb") load("//common:variables.bzl", "DEBUG_MODE", "USERS") +load("//private/util:deb.bzl", "deb") def cc_image_index(distro, architectures): """cc image index for a distro diff --git a/examples/nonroot/BUILD b/examples/nonroot/BUILD index 2e14c684d..08fca3c95 100644 --- a/examples/nonroot/BUILD +++ b/examples/nonroot/BUILD @@ -2,11 +2,11 @@ # reference only. Note that repo maintainers can freely change any part of the # repository code at any time. load("@container_structure_test//:defs.bzl", "container_structure_test") -load("@rules_go//go:def.bzl", "go_binary") load("@rules_distroless//distroless:defs.bzl", "home", "passwd") +load("@rules_go//go:def.bzl", "go_binary") load("@rules_oci//oci:defs.bzl", "oci_image") -load("//private/util:tar.bzl", "tar") load("//:distro.bzl", DISTROS = "ALL_DISTROS") +load("//private/util:tar.bzl", "tar") # Create a passwd file and home directory with a nonroot user and uid. passwd( diff --git a/java/BUILD b/java/BUILD index fac2ae17f..0c7955c0d 100644 --- a/java/BUILD +++ b/java/BUILD @@ -1,5 +1,5 @@ -load(":java.bzl", "java_base_image", "java_base_image_index", "java_image", "java_image_index") load(":config.bzl", "JAVA_ARCHITECTURES", "JAVA_BASE_PACKAGES", "JAVA_DISTROS") +load(":java.bzl", "java_base_image", "java_base_image_index", "java_image", "java_image_index") package(default_visibility = ["//visibility:public"]) diff --git a/java/java.bzl b/java/java.bzl index 6257f5abc..5cd05fad2 100644 --- a/java/java.bzl +++ b/java/java.bzl @@ -2,12 +2,12 @@ load("@container_structure_test//:defs.bzl", "container_structure_test") load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index") -load("//private/util:tar.bzl", "tar") load("//common:variables.bzl", "DEBUG_MODE", "USERS") load("//java:jre_ver.bzl", "jre_ver") load("//private/oci:defs.bzl", oci_java_image = "java_image") load("//private/util:deb.bzl", "deb") load("//private/util:java_cacerts.bzl", "java_cacerts") +load("//private/util:tar.bzl", "tar") def ca_certs(distro, arch): """java ca certs for a specific arch and distro diff --git a/knife b/knife index 09710479e..5fc4fa088 100755 --- a/knife +++ b/knife @@ -141,6 +141,10 @@ function cmd_github_update_snapshots() { } function cmd_lint () { + local mode="fix" + if [[ "${1:-}" == "--check" ]]; then + mode="check" + fi echo "🧹 Linting" echo "" if ! which buildifier > /dev/null; then @@ -148,7 +152,7 @@ function cmd_lint () { echo " Did you follow the ./CONTRIBUTING.md ?" exit 1 fi - buildifier -mode=fix $(find . -name 'BUILD*' -o -name 'WORKSPACE*' -o -name '*.bzl' -type f) + buildifier -mode=$mode $(find . -type f \( -name 'BUILD*' -o -name 'WORKSPACE*' -o -name '*.bzl' \)) } function cmd_update_node_archives () { @@ -216,7 +220,7 @@ update-non-snapshots) cmd_lock_non_snapshots ;; lint) - cmd_lint + cmd_lint "${@:2}" ;; github-update-snapshots) cmd_github_update_snapshots diff --git a/nodejs/BUILD b/nodejs/BUILD index 82d82c643..f2e125c9c 100644 --- a/nodejs/BUILD +++ b/nodejs/BUILD @@ -1,5 +1,5 @@ -load(":nodejs.bzl", "nodejs_image", "nodejs_image_index") load(":config.bzl", "NODEJS_ARCHITECTURES", "NODEJS_DISTROS", "NODEJS_MAJOR_VERSIONS") +load(":nodejs.bzl", "nodejs_image", "nodejs_image_index") package(default_visibility = ["//visibility:public"]) diff --git a/nodejs/nodejs.bzl b/nodejs/nodejs.bzl index 3606797b3..e1872428a 100644 --- a/nodejs/nodejs.bzl +++ b/nodejs/nodejs.bzl @@ -2,8 +2,8 @@ load("@container_structure_test//:defs.bzl", "container_structure_test") load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index") -load("//private/util:tar.bzl", "tar") load("//common:variables.bzl", "DEBUG_MODE", "USERS") +load("//private/util:tar.bzl", "tar") def nodejs_image_index(distro, major_version, architectures): """nodejs image index for a distro. diff --git a/private/oci/defs.bzl b/private/oci/defs.bzl index bf575d09f..99663aa10 100644 --- a/private/oci/defs.bzl +++ b/private/oci/defs.bzl @@ -1,7 +1,7 @@ -load(":java_image.bzl", _java_image = "java_image") load(":cc_image.bzl", _cc_image = "cc_image") -load(":rust_image.bzl", _rust_image = "rust_image") load(":go_image.bzl", _go_image = "go_image") +load(":java_image.bzl", _java_image = "java_image") +load(":rust_image.bzl", _rust_image = "rust_image") load(":sign_and_push.bzl", _sign_and_push_all = "sign_and_push_all") java_image = _java_image diff --git a/private/oci/rust_image.bzl b/private/oci/rust_image.bzl index 62cda1166..100bc1ccf 100644 --- a/private/oci/rust_image.bzl +++ b/private/oci/rust_image.bzl @@ -1,8 +1,8 @@ "rust_image rule for creating Rust container images" load("@rules_oci//oci:defs.bzl", "oci_image") -load("//private/util:tar.bzl", "tar") load("@rules_rust//rust:defs.bzl", "rust_binary") +load("//private/util:tar.bzl", "tar") def rust_image(name, srcs, base, tags): rust_binary( diff --git a/private/pkg/test/oci_image/BUILD.bazel b/private/pkg/test/oci_image/BUILD.bazel index f489dee19..4753f6039 100644 --- a/private/pkg/test/oci_image/BUILD.bazel +++ b/private/pkg/test/oci_image/BUILD.bazel @@ -1,5 +1,5 @@ -load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index") load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files") +load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index") load("//private/pkg:oci_image_spdx.bzl", "oci_image_spdx") load("//private/util:deb.bzl", "deb") diff --git a/python3/BUILD b/python3/BUILD index c06c3ded7..bbd60e351 100644 --- a/python3/BUILD +++ b/python3/BUILD @@ -1,7 +1,7 @@ -load(":config.bzl", "PYTHON_ARCHITECTURES", "PYTHON_DISTROS", "PYTHON_PACKAGES") -load(":python.bzl", "python3_image", "python3_image_index") load("//private/util:tar.bzl", "tar") +load(":config.bzl", "PYTHON_ARCHITECTURES", "PYTHON_DISTROS", "PYTHON_PACKAGES") load(":ldconfig.bzl", "python3_ldconfig") +load(":python.bzl", "python3_image", "python3_image_index") package(default_visibility = ["//visibility:public"])