From fc01ee5bd68335b560b493167915e94378cd573b Mon Sep 17 00:00:00 2001 From: Manuel Naranjo Date: Tue, 16 Jul 2024 11:39:09 +0200 Subject: [PATCH] ci: improve setup Using a matrix instead of copying the test structure so many times, make CI explicit about us using bazelisk and not plain bazel --- .bazelrc | 11 +- .github/workflows/action.yml | 72 ++++++++---- .github/workflows/ci.bazelrc | 6 + .gitignore | 3 + Makefile | 14 ++- e2e/bazel-5/.bazelversion | 1 - e2e/bazel-6/.bazelrc | 15 --- e2e/bazel-6/.bazelversion | 1 - e2e/bazel-6/BUILD.bazel | 36 ------ e2e/bazel-6/WORKSPACE | 35 ------ e2e/bazel-7/.bazelrc | 15 --- e2e/bazel-7/.bazelversion | 1 - e2e/bazel-7/BUILD.bazel | 36 ------ e2e/bazel-7/MODULE.bazel | 6 - e2e/bazel-7/MODULE.bazel.lock | 110 ------------------- e2e/bazel-7/WORKSPACE | 35 ------ e2e/{bazel-5 => bazel-workspace}/.bazelrc | 0 e2e/bazel-workspace/.gitignore | 2 + e2e/{bazel-5 => bazel-workspace}/BUILD.bazel | 0 e2e/{bazel-5 => bazel-workspace}/WORKSPACE | 0 20 files changed, 71 insertions(+), 328 deletions(-) create mode 100644 .github/workflows/ci.bazelrc delete mode 100644 e2e/bazel-5/.bazelversion delete mode 100644 e2e/bazel-6/.bazelrc delete mode 100644 e2e/bazel-6/.bazelversion delete mode 100644 e2e/bazel-6/BUILD.bazel delete mode 100644 e2e/bazel-6/WORKSPACE delete mode 100644 e2e/bazel-7/.bazelrc delete mode 100644 e2e/bazel-7/.bazelversion delete mode 100644 e2e/bazel-7/BUILD.bazel delete mode 100644 e2e/bazel-7/MODULE.bazel delete mode 100644 e2e/bazel-7/MODULE.bazel.lock delete mode 100644 e2e/bazel-7/WORKSPACE rename e2e/{bazel-5 => bazel-workspace}/.bazelrc (100%) create mode 100644 e2e/bazel-workspace/.gitignore rename e2e/{bazel-5 => bazel-workspace}/BUILD.bazel (100%) rename e2e/{bazel-5 => bazel-workspace}/WORKSPACE (100%) diff --git a/.bazelrc b/.bazelrc index 9c719c2..383386a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -8,16 +8,7 @@ import %workspace%/.aspect/bazelrc/performance.bazelrc # Specific project flags go here if we have some -# register toolchains with prebuilts -common:prebuilt-toolchain --extra_toolchains=@bazeldnf_prebuilt//:linux-amd64-toolchain -common:prebuilt-toolchain --extra_toolchains=@bazeldnf_prebuilt//:linux-arm64-toolchain -common:prebuilt-toolchain --extra_toolchains=@bazeldnf_prebuilt//:linux-ppc64-toolchain -common:prebuilt-toolchain --extra_toolchains=@bazeldnf_prebuilt//:linux-ppc64le-toolchain -common:prebuilt-toolchain --extra_toolchains=@bazeldnf_prebuilt//:linux-s390x-toolchain -common:prebuilt-toolchain --extra_toolchains=@bazeldnf_prebuilt//:darwin-amd64-toolchain -common:prebuilt-toolchain --extra_toolchains=@bazeldnf_prebuilt//:darwin-arm64-toolchain - -common:built-toolchain --extra_toolchains=//cmd:bazeldnf-host-toolchain +common --extra_toolchains=//cmd:bazeldnf-host-toolchain # Load any settings & overrides specific to the current user from `.bazelrc.user`. # This file should appear in `.gitignore` so that settings are not shared with team members. This diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index da4bd5a..82326bb 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -6,33 +6,61 @@ on: pull_request: branches: [ main ] +concurrency: + # Cancel previous actions from the same PR or branch except 'main' branch. + # See https://docs.github.com/en/actions/using-jobs/using-concurrency and https://docs.github.com/en/actions/learn-github-actions/contexts for more info. + group: concurrency-group::${{ github.workflow }}::${{ github.event.pull_request.number > 0 && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}${{ github.ref_name == 'main' && format('::{0}', github.run_id) || ''}} + cancel-in-progress: ${{ github.ref_name != 'main' }} + jobs: build-and-test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: bazelbuild/setup-bazelisk@v1 - - run: bazel build --config=built-toolchain //... && bazel test --config=built-toolchain //... - - # TODO: deprecate by Jan 2025 https://bazel.build/release - build-e2e-bazel-5: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: bazelbuild/setup-bazelisk@v1 - - run: cd e2e/bazel-5 && bazel build //... - - build-e2e-bazel-6-nobzlmod: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: bazelbuild/setup-bazelisk@v1 - - run: cd e2e/bazel-6 && bazel build //... + - uses: actions/checkout@v4 + - uses: bazel-contrib/setup-bazel@0.8.5 + with: + # Avoid downloading Bazel every time. + bazelisk-cache: true + # Keep a disk-cache + disk-cache: true + # Share repository cache between workflows. + repository-cache: true + # enable some flags for CI + bazelrc: | + import %workspace%/.aspect/bazelrc/ci.bazelrc + import %workspace%/.github/workflows/ci.bazelrc + # keep a cache for MODULE.bazel repos + external-cache: true + - run: bazelisk build //... && bazelisk test //... - build-e2e-bazel-7-nobzlmod: + e2e-workspace-matrix: + strategy: + matrix: + version: + - version: 5.x # TODO: deprecate by Jan 2025 https://bazel.build/release + bazelrc: + - version: 6.x + bazelrc: | + import %workspace%/../../.aspect/bazelrc/bazel6.bazelrc + - version: 7.x + bazelrc: | + import %workspace%/../../.aspect/bazelrc/bazel6.bazelrc + import %workspace%/../../.aspect/bazelrc/bazel7.bazelrc runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: bazelbuild/setup-bazelisk@v1 - - run: cd e2e/bazel-7 && bazel build //... + - uses: actions/checkout@v4 + - uses: bazel-contrib/setup-bazel@0.8.5 + with: + # Avoid downloading Bazel every time. + bazelisk-cache: true + # Keep a disk-cache + disk-cache: true + # Share repository cache between workflows. + repository-cache: true + # enable some flags for CI + bazelrc: | + import %workspace%/../../.aspect/bazelrc/ci.bazelrc + import %workspace%/../../.github/workflows/ci.bazelrc + ${{ matrix.version.bazelrc }} + - run: cd e2e/bazel-workspace && USE_BAZEL_VERSION=${{ matrix.version.version }} bazelisk build //... diff --git a/.github/workflows/ci.bazelrc b/.github/workflows/ci.bazelrc new file mode 100644 index 0000000..22056f3 --- /dev/null +++ b/.github/workflows/ci.bazelrc @@ -0,0 +1,6 @@ +# this settings are extra to the ones from .aspect/bazelrc/ci.bazelrc +# we don't put it there as otherwise the test to keep flags up to date will +# always fail + +# Allows tests to run bazelisk-in-bazel, since this is the cache folder used +common --test_env=XDG_CACHE_HOME diff --git a/.gitignore b/.gitignore index 3a395cc..6a795a8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ repo.yaml dist cmd/cmd .bazelrc.user + +# temporary files from MODULE.bazel +MODULE.bazel.lock diff --git a/Makefile b/Makefile index d473488..64c51e9 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ deps-update: gazelle: bazelisk run //:gazelle -test: gazelle - bazelisk build --config=built-toolchain //... && bazelisk test --config=built-toolchain //... +test: gazelle e2e + bazelisk build //... && bazelisk test //... buildifier: bazelisk run //:buildifier @@ -17,9 +17,13 @@ gofmt: gofmt -w pkg/.. cmd/.. e2e: - (cd e2e/bazel-5 && bazelisk build //...) - (cd e2e/bazel-6 && bazelisk build //...) - (cd e2e/bazel-7 && bazelisk build //...) + @for version in 5.x 6.x 7.x; do \ + ( \ + cd e2e/bazel-workspace && \ + echo "Testing $$version" > /dev/stderr && \ + USE_BAZEL_VERSION=$$version bazelisk --batch build //...\ + ) \ + done fmt: gofmt buildifier diff --git a/e2e/bazel-5/.bazelversion b/e2e/bazel-5/.bazelversion deleted file mode 100644 index 42267a2..0000000 --- a/e2e/bazel-5/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -5.x diff --git a/e2e/bazel-6/.bazelrc b/e2e/bazel-6/.bazelrc deleted file mode 100644 index ba3f375..0000000 --- a/e2e/bazel-6/.bazelrc +++ /dev/null @@ -1,15 +0,0 @@ -# Import Aspect bazelrc presets - -import %workspace%/../../.aspect/bazelrc/bazel6.bazelrc -import %workspace%/../../.aspect/bazelrc/convenience.bazelrc -import %workspace%/../../.aspect/bazelrc/correctness.bazelrc -import %workspace%/../../.aspect/bazelrc/debug.bazelrc -import %workspace%/../../.aspect/bazelrc/performance.bazelrc - -# Specific project flags go here if we have some - -# Load any settings & overrides specific to the current user from `.bazelrc.user`. -# This file should appear in `.gitignore` so that settings are not shared with team members. This -# should be last statement in this config so the user configuration is able to overwrite flags from -# this file. See https://bazel.build/configure/best-practices#bazelrc-file. -try-import %workspace%/../../.bazelrc.user diff --git a/e2e/bazel-6/.bazelversion b/e2e/bazel-6/.bazelversion deleted file mode 100644 index 8f0591a..0000000 --- a/e2e/bazel-6/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -6.x diff --git a/e2e/bazel-6/BUILD.bazel b/e2e/bazel-6/BUILD.bazel deleted file mode 100644 index 48e40e6..0000000 --- a/e2e/bazel-6/BUILD.bazel +++ /dev/null @@ -1,36 +0,0 @@ -load("@bazeldnf//bazeldnf:defs.bzl", "bazeldnf", "rpmtree", "tar2files") -load("@rules_pkg//pkg:tar.bzl", "pkg_tar") - -bazeldnf( - name = "bazeldnf", -) - -rpmtree( - name = "something", - rpms = [ - "@libvirt-libs-6.1.0-2.fc32.x86_64.rpm//rpm", - "@libvirt-devel-6.1.0-2.fc32.x86_64.rpm//rpm", - ], -) - -tar2files( - name = "something_libs", - files = { - "/usr/lib64": [ - "libvirt.so.0", - "libvirt.so.0.6001.0", - ], - }, - tar = ":something", - visibility = ["//visibility:public"], -) - -pkg_tar( - name = "whatever", - deps = [":something"], -) - -cc_library( - name = "bar", - srcs = ["//:something_libs/usr/lib64"], -) diff --git a/e2e/bazel-6/WORKSPACE b/e2e/bazel-6/WORKSPACE deleted file mode 100644 index 2e6ce02..0000000 --- a/e2e/bazel-6/WORKSPACE +++ /dev/null @@ -1,35 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -local_repository( - name = "bazeldnf", - path = "../../", -) - -load("@bazeldnf//bazeldnf:deps.bzl", "bazeldnf_dependencies") - -bazeldnf_dependencies() - -load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") - -bazel_skylib_workspace() - -# dependencies for integration tests -load("@bazeldnf//:test_deps.bzl", "bazeldnf_test_dependencies") - -bazeldnf_test_dependencies() - -http_archive( - name = "rules_pkg", - sha256 = "cad05f864a32799f6f9022891de91ac78f30e0fa07dc68abac92a628121b5b11", - urls = [ - "https://github.com/bazelbuild/rules_pkg/releases/download/1.0.0/rules_pkg-1.0.0.tar.gz", - ], -) - -load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") - -rules_pkg_dependencies() - -load("@bazeldnf//bazeldnf:toolchain.bzl", "bazeldnf_prebuilt_register_toolchains") - -bazeldnf_prebuilt_register_toolchains(name = "bazeldnf_prebuilt") diff --git a/e2e/bazel-7/.bazelrc b/e2e/bazel-7/.bazelrc deleted file mode 100644 index bb32d4e..0000000 --- a/e2e/bazel-7/.bazelrc +++ /dev/null @@ -1,15 +0,0 @@ -# Import Aspect bazelrc presets -import %workspace%/../../.aspect/bazelrc/convenience.bazelrc -import %workspace%/../../.aspect/bazelrc/bazel6.bazelrc -import %workspace%/../../.aspect/bazelrc/bazel7.bazelrc -import %workspace%/../../.aspect/bazelrc/correctness.bazelrc -import %workspace%/../../.aspect/bazelrc/debug.bazelrc -import %workspace%/../../.aspect/bazelrc/performance.bazelrc - -# Specific project flags go here if we have some - -# Load any settings & overrides specific to the current user from `.bazelrc.user`. -# This file should appear in `.gitignore` so that settings are not shared with team members. This -# should be last statement in this config so the user configuration is able to overwrite flags from -# this file. See https://bazel.build/configure/best-practices#bazelrc-file. -try-import %workspace%/../../.bazelrc.user diff --git a/e2e/bazel-7/.bazelversion b/e2e/bazel-7/.bazelversion deleted file mode 100644 index 35907cd..0000000 --- a/e2e/bazel-7/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -7.x diff --git a/e2e/bazel-7/BUILD.bazel b/e2e/bazel-7/BUILD.bazel deleted file mode 100644 index 48e40e6..0000000 --- a/e2e/bazel-7/BUILD.bazel +++ /dev/null @@ -1,36 +0,0 @@ -load("@bazeldnf//bazeldnf:defs.bzl", "bazeldnf", "rpmtree", "tar2files") -load("@rules_pkg//pkg:tar.bzl", "pkg_tar") - -bazeldnf( - name = "bazeldnf", -) - -rpmtree( - name = "something", - rpms = [ - "@libvirt-libs-6.1.0-2.fc32.x86_64.rpm//rpm", - "@libvirt-devel-6.1.0-2.fc32.x86_64.rpm//rpm", - ], -) - -tar2files( - name = "something_libs", - files = { - "/usr/lib64": [ - "libvirt.so.0", - "libvirt.so.0.6001.0", - ], - }, - tar = ":something", - visibility = ["//visibility:public"], -) - -pkg_tar( - name = "whatever", - deps = [":something"], -) - -cc_library( - name = "bar", - srcs = ["//:something_libs/usr/lib64"], -) diff --git a/e2e/bazel-7/MODULE.bazel b/e2e/bazel-7/MODULE.bazel deleted file mode 100644 index 00bb183..0000000 --- a/e2e/bazel-7/MODULE.bazel +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################### -# Bazel now uses Bzlmod by default to manage external dependencies. -# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel. -# -# For more details, please check https://github.com/bazelbuild/bazel/issues/18958 -############################################################################### diff --git a/e2e/bazel-7/MODULE.bazel.lock b/e2e/bazel-7/MODULE.bazel.lock deleted file mode 100644 index f5cd531..0000000 --- a/e2e/bazel-7/MODULE.bazel.lock +++ /dev/null @@ -1,110 +0,0 @@ -{ - "lockFileVersion": 11, - "registryFileHashes": { - "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497", - "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2", - "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589", - "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/source.json": "7e3a9adf473e9af076ae485ed649d5641ad50ec5c11718103f34de03170d94ad", - "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef", - "https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862", - "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8", - "https://bcr.bazel.build/modules/bazel_features/1.11.0/source.json": "c9320aa53cd1c441d24bd6b716da087ad7e4ff0d9742a9884587596edfe53015", - "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8", - "https://bcr.bazel.build/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a", - "https://bcr.bazel.build/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5", - "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917", - "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/source.json": "082ed5f9837901fada8c68c2f3ddc958bb22b6d654f71dd73f3df30d45d4b749", - "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84", - "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8", - "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4", - "https://bcr.bazel.build/modules/googletest/1.11.0/source.json": "c73d9ef4268c91bd0c1cd88f1f9dfa08e814b1dbe89b5f594a9f08ba0244d206", - "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee", - "https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37", - "https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615", - "https://bcr.bazel.build/modules/platforms/0.0.7/MODULE.bazel": "72fd4a0ede9ee5c021f6a8dd92b503e089f46c227ba2813ff183b71616034814", - "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc", - "https://bcr.bazel.build/modules/platforms/0.0.9/source.json": "cd74d854bf16a9e002fb2ca7b1a421f4403cda29f824a765acd3a8c56f8d43e6", - "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7", - "https://bcr.bazel.build/modules/protobuf/21.7/source.json": "bbe500720421e582ff2d18b0802464205138c06056f443184de39fbb8187b09b", - "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0", - "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858", - "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647", - "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c", - "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", - "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5", - "https://bcr.bazel.build/modules/rules_cc/0.0.9/source.json": "1f1ba6fea244b616de4a554a0f4983c91a9301640c8fe0dd1d410254115c8430", - "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74", - "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", - "https://bcr.bazel.build/modules/rules_java/7.6.1/source.json": "8f3f3076554e1558e8e468b2232991c510ecbcbed9e6f8c06ac31c93bcf38362", - "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", - "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/source.json": "a075731e1b46bc8425098512d038d416e966ab19684a10a34f4741295642fc35", - "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0", - "https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d", - "https://bcr.bazel.build/modules/rules_license/0.0.7/source.json": "355cc5737a0f294e560d52b1b7a6492d4fff2caf0bef1a315df5a298fca2d34a", - "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc", - "https://bcr.bazel.build/modules/rules_pkg/0.7.0/source.json": "c2557066e0c0342223ba592510ad3d812d4963b9024831f7f66fd0584dd8c66c", - "https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06", - "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7", - "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/source.json": "d57902c052424dfda0e71646cb12668d39c4620ee0544294d9d941e7d12bc3a9", - "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f", - "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7", - "https://bcr.bazel.build/modules/rules_python/0.22.1/source.json": "57226905e783bae7c37c2dd662be078728e48fa28ee4324a7eabcafb5a43d014", - "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c", - "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", - "https://bcr.bazel.build/modules/stardoc/0.5.1/source.json": "a96f95e02123320aa015b956f29c00cb818fa891ef823d55148e1a362caacf29", - "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", - "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459", - "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", - "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", - "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72", - "https://bcr.bazel.build/modules/zlib/1.3/source.json": "b6b43d0737af846022636e6e255fd4a96fee0d34f08f3830e6e0bac51465c37c" - }, - "selectedYankedVersions": {}, - "moduleExtensions": { - "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": { - "general": { - "bzlTransitiveDigest": "PjIds3feoYE8SGbbIq2SFTZy3zmxeO2tQevJZNDo7iY=", - "usagesDigest": "aLmqbvowmHkkBPve05yyDNGN7oh7QE9kBADr3QIZTZs=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "local_config_apple_cc": { - "bzlFile": "@@apple_support~//crosstool:setup.bzl", - "ruleClassName": "_apple_cc_autoconf", - "attributes": {} - }, - "local_config_apple_cc_toolchains": { - "bzlFile": "@@apple_support~//crosstool:setup.bzl", - "ruleClassName": "_apple_cc_autoconf_toolchains", - "attributes": {} - } - }, - "recordedRepoMappingEntries": [ - [ - "apple_support~", - "bazel_tools", - "bazel_tools" - ] - ] - } - }, - "@@platforms//host:extension.bzl%host_platform": { - "general": { - "bzlTransitiveDigest": "xelQcPZH8+tmuOHVjL9vDxMnnQNMlwj0SlvgoqBkm4U=", - "usagesDigest": "meSzxn3DUCcYEhq4HQwExWkWtU4EjriRBQLsZN+Q0SU=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "host_platform": { - "bzlFile": "@@platforms//host:extension.bzl", - "ruleClassName": "host_platform_repo", - "attributes": {} - } - }, - "recordedRepoMappingEntries": [] - } - } - } -} diff --git a/e2e/bazel-7/WORKSPACE b/e2e/bazel-7/WORKSPACE deleted file mode 100644 index 2e6ce02..0000000 --- a/e2e/bazel-7/WORKSPACE +++ /dev/null @@ -1,35 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -local_repository( - name = "bazeldnf", - path = "../../", -) - -load("@bazeldnf//bazeldnf:deps.bzl", "bazeldnf_dependencies") - -bazeldnf_dependencies() - -load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") - -bazel_skylib_workspace() - -# dependencies for integration tests -load("@bazeldnf//:test_deps.bzl", "bazeldnf_test_dependencies") - -bazeldnf_test_dependencies() - -http_archive( - name = "rules_pkg", - sha256 = "cad05f864a32799f6f9022891de91ac78f30e0fa07dc68abac92a628121b5b11", - urls = [ - "https://github.com/bazelbuild/rules_pkg/releases/download/1.0.0/rules_pkg-1.0.0.tar.gz", - ], -) - -load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") - -rules_pkg_dependencies() - -load("@bazeldnf//bazeldnf:toolchain.bzl", "bazeldnf_prebuilt_register_toolchains") - -bazeldnf_prebuilt_register_toolchains(name = "bazeldnf_prebuilt") diff --git a/e2e/bazel-5/.bazelrc b/e2e/bazel-workspace/.bazelrc similarity index 100% rename from e2e/bazel-5/.bazelrc rename to e2e/bazel-workspace/.bazelrc diff --git a/e2e/bazel-workspace/.gitignore b/e2e/bazel-workspace/.gitignore new file mode 100644 index 0000000..d984f90 --- /dev/null +++ b/e2e/bazel-workspace/.gitignore @@ -0,0 +1,2 @@ +# bazel 7+ will generate this file +MODULE.bazel diff --git a/e2e/bazel-5/BUILD.bazel b/e2e/bazel-workspace/BUILD.bazel similarity index 100% rename from e2e/bazel-5/BUILD.bazel rename to e2e/bazel-workspace/BUILD.bazel diff --git a/e2e/bazel-5/WORKSPACE b/e2e/bazel-workspace/WORKSPACE similarity index 100% rename from e2e/bazel-5/WORKSPACE rename to e2e/bazel-workspace/WORKSPACE