ci: use new e2e setup

manuelnaranjo · manuelnaranjo · commit bbea61da324b · 2026-02-10T20:53:05.000+01:00
Drive tests entirely through bazel even on CI
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -34,83 +34,15 @@ jobs:
           try-import %workspace%/../../.github/workflows/ci.bazelrc
         # keep a cache for MODULE.bazel repos
         external-cache: true
-    - run: bazelisk build //... && bazelisk test //...
-
-  e2e-workspace-matrix:
-    strategy:
-      matrix:
-        version:
-          - version: 6.x
-            bazelrc: |
-              import %workspace%/../../.aspect/bazelrc/bazel6.bazelrc
-          - version: 7.x
-            bazelrc: |
-              import %workspace%/../../.aspect/bazelrc/bazel7.bazelrc
-              import %workspace%/../../.aspect/bazelrc/bazel6.bazelrc
-    runs-on: ubuntu-latest
-    steps:
-    - 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 //...
-
-  e2e-bzlmod-matrix:
-    strategy:
-      matrix:
-        version: [7.x, 8.x]
-        path:
-          - bazel-bzlmod
-          - bazel-bzlmod-lock-file
-
-    runs-on: ubuntu-latest
-    steps:
-    - 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
-    - run: cd e2e/${{ matrix.path }} && USE_BAZEL_VERSION=${{ matrix.version }} bazelisk build //...
-
-  e2e-bzlmod-build-toolchain-matrix:
-    strategy:
-      matrix:
-        version: [7.x, 8.x]
-
-    runs-on: ubuntu-latest
-    steps:
-    - 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
-    - run: cd e2e/bazel-bzlmod-toolchain-from-source && USE_BAZEL_VERSION=${{ matrix.version }} bazelisk build //...
+    - id: build
+      run: bazelisk build //...
+    - id: unit-tests
+      run: bazelisk test //...
+    - id: e2e-that-should-pass
+      run: bazelisk test e2e
+    - id: e2e-that-are-allowed-to-fail
+      continue-on-error: true
+      run: bazel test //e2e:circular-deps
 
   e2e-repo-yaml:
     runs-on: ubuntu-latest
@@ -129,60 +61,7 @@ jobs:
           import %workspace%/.aspect/bazelrc/ci.bazelrc
           import %workspace%/.github/workflows/ci.bazelrc
     - run: |
-        export USE_BAZEL_VERSION=7.x
+        export USE_BAZEL_VERSION=8.x
         bazelisk run //cmd -- init --fc 41 --output $(pwd)/repo.yaml
         bazelisk run //cmd -- fetch --repofile $(pwd)/repo.yaml
         bazelisk run //cmd -- resolve --repofile $(pwd)/repo.yaml bash
-
-  e2e-bzlmod-lock-file-from-args:
-    runs-on: ubuntu-latest
-    steps:
-    - 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
-    - run: |
-        export USE_BAZEL_VERSION=8.x
-        cd e2e/bazel-bzlmod-lock-file-from-args && bazelisk run :bazeldnf -- fetch && bazelisk run @bazeldnf_rpms//:update-lock-file && bazelisk build ...
-
-  e2e-bzlmod-toolchain-circular-dependencies:
-    runs-on: ubuntu-latest
-    steps:
-    - 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
-    - id: prepare
-      run: |
-        export USE_BAZEL_VERSION=8.x
-        cd e2e/bzlmod-toolchain-circular-dependencies
-        bazelisk run @bazeldnf_rpms//:fetch-repo
-        bazelisk run @bazeldnf_rpms//:update-lock-file
-    - id: test
-      run: |
-        export USE_BAZEL_VERSION=8.x
-        cd e2e/bzlmod-toolchain-circular-dependencies
-        bazelisk build //... || status=$?
-        if [ ${status} -ne 0 ]; then
-          echo "::warning::Optional job failed."
-          echo "optional_fail=true" >> "${GITHUB_OUTPUT}"
-          echo "optional_fail_status=${status}" >> "${GITHUB_OUTPUT}"
-        fi
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -111,6 +111,7 @@ filegroup(
     srcs = [
         "MODULE.bazel",
         "WORKSPACE",
+        "//:.github/workflows/ci.bazelrc",
         "//.aspect/bazelrc:all_files",
         "//bazeldnf:all_files",
         "//bazeldnf/private:all_files",
diff --git a/e2e/bazel-bzlmod-lock-file-from-args/.aspect b/e2e/bazel-bzlmod-lock-file-from-args/.aspect
@@ -0,0 +1 @@
+../../.aspect
diff --git a/e2e/bazel-bzlmod-lock-file-from-args/.github b/e2e/bazel-bzlmod-lock-file-from-args/.github
@@ -0,0 +1 @@
+../../.github
diff --git a/e2e/bazel-bzlmod-lock-file/.aspect b/e2e/bazel-bzlmod-lock-file/.aspect
@@ -0,0 +1 @@
+../../.aspect
diff --git a/e2e/bazel-bzlmod-lock-file/.github b/e2e/bazel-bzlmod-lock-file/.github
@@ -0,0 +1 @@
+../../.github
diff --git a/e2e/bazel-bzlmod-toolchain-from-source-lock-file/.aspect b/e2e/bazel-bzlmod-toolchain-from-source-lock-file/.aspect
@@ -0,0 +1 @@
+../../.aspect
diff --git a/e2e/bazel-bzlmod-toolchain-from-source-lock-file/.github b/e2e/bazel-bzlmod-toolchain-from-source-lock-file/.github
@@ -0,0 +1 @@
+../../.github
diff --git a/e2e/bazel-bzlmod-toolchain-from-source/.aspect b/e2e/bazel-bzlmod-toolchain-from-source/.aspect
@@ -0,0 +1 @@
+../../.aspect
diff --git a/e2e/bazel-bzlmod-toolchain-from-source/.github b/e2e/bazel-bzlmod-toolchain-from-source/.github
@@ -0,0 +1 @@
+../../.github
diff --git a/e2e/bazel-bzlmod/.aspect b/e2e/bazel-bzlmod/.aspect
@@ -0,0 +1 @@
+../../.aspect
diff --git a/e2e/bazel-bzlmod/.github b/e2e/bazel-bzlmod/.github
@@ -0,0 +1 @@
+../../.github
diff --git a/e2e/bazel-workspace/.aspect b/e2e/bazel-workspace/.aspect
@@ -0,0 +1 @@
+../../.aspect
diff --git a/e2e/bazel-workspace/.github b/e2e/bazel-workspace/.github
@@ -0,0 +1 @@
+../../.github
diff --git a/e2e/bzlmod-toolchain-circular-dependencies/.aspect b/e2e/bzlmod-toolchain-circular-dependencies/.aspect
@@ -0,0 +1 @@
+../../.aspect
diff --git a/e2e/bzlmod-toolchain-circular-dependencies/.github b/e2e/bzlmod-toolchain-circular-dependencies/.github
@@ -0,0 +1 @@
+../../.github
