From 660781d35e655093e920e12c079d0fb5981a3b1a Mon Sep 17 00:00:00 2001
From: Malte Poll <mp@edgeless.systems>
Date: Fri, 19 May 2023 15:36:54 +0200
Subject: [PATCH] misc: bazelisk -> bazel

---
 .github/actions/e2e_mini/action.yml       |  2 +-
 .github/actions/notify_failure/action.yml |  2 +-
 .github/workflows/build-ccm-gcp.yml       |  2 +-
 .github/workflows/e2e-upgrade.yml         |  4 ++--
 .github/workflows/test-integration.yml    |  2 +-
 .github/workflows/test-tidy.yml           | 10 +++++-----
 .github/workflows/test-unittest.yml       |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/actions/e2e_mini/action.yml b/.github/actions/e2e_mini/action.yml
index ce749488d..5b8b7f45f 100644
--- a/.github/actions/e2e_mini/action.yml
+++ b/.github/actions/e2e_mini/action.yml
@@ -49,4 +49,4 @@ runs:
         ARM_SUBSCRIPTION_ID: ${{ inputs.azureSubscriptionID }}
         ARM_TENANT_ID: ${{ inputs.azureTenantID }}
       run: |
-        bazelisk run //e2e/miniconstellation:push_remote_test
+        bazel run //e2e/miniconstellation:push_remote_test
diff --git a/.github/actions/notify_failure/action.yml b/.github/actions/notify_failure/action.yml
index 62697f6a2..aec684b99 100644
--- a/.github/actions/notify_failure/action.yml
+++ b/.github/actions/notify_failure/action.yml
@@ -64,7 +64,7 @@ runs:
         cat metadata.json
 
         issueURL=$(
-        bazelisk run //bazel/ci:ghh -- create-project-issue \
+        bazel run //bazel/ci:ghh -- create-project-issue \
           --body body.md \
           --metadata metadata.json \
           -v
diff --git a/.github/workflows/build-ccm-gcp.yml b/.github/workflows/build-ccm-gcp.yml
index f5d7d9080..d78ad18ac 100644
--- a/.github/workflows/build-ccm-gcp.yml
+++ b/.github/workflows/build-ccm-gcp.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Build CCM
         run: |
-          bazelisk build //cmd/cloud-controller-manager:cloud-controller-manager
+          bazel build //cmd/cloud-controller-manager:cloud-controller-manager
 
       - name: Copy CCM
         run: |
diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml
index 586449701..b9ceb8274 100644
--- a/.github/workflows/e2e-upgrade.yml
+++ b/.github/workflows/e2e-upgrade.yml
@@ -181,8 +181,8 @@ jobs:
             KUBERNETES_FLAG="--target-kubernetes=$KUBERNETES"
           fi
 
-          bazelisk run //bazel/release:push
-          bazelisk run //e2e/internal/upgrade:upgrade_test -- --want-worker "$WORKERNODES" --want-control "$CONTROLNODES" --target-image "$IMAGE" "$KUBERNETES_FLAG" "$MICROSERVICES_FLAG"
+          bazel run //bazel/release:push
+          bazel run //e2e/internal/upgrade:upgrade_test -- --want-worker "$WORKERNODES" --want-control "$CONTROLNODES" --target-image "$IMAGE" "$KUBERNETES_FLAG" "$MICROSERVICES_FLAG"
 
       - name: Always fetch logs
         if: always()
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index 693aea69f..84bab4669 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -39,7 +39,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y libcryptsetup12 libcryptsetup-dev
 
       - name: Create and populate build folder
-        run: mkdir build && cd build && cmake -DBAZEL:STRING=bazelisk ..
+        run: mkdir build && cd build && cmake ..
 
       # Runs all test targets starting with "integration-"
       - name: Integration Tests
diff --git a/.github/workflows/test-tidy.yml b/.github/workflows/test-tidy.yml
index fc9fbecfc..5ad276a7b 100644
--- a/.github/workflows/test-tidy.yml
+++ b/.github/workflows/test-tidy.yml
@@ -51,12 +51,12 @@ jobs:
         if: startsWith(github.head_ref, 'renovate/')
         shell: bash
         run: |
-          bazelisk run //bazel/ci:deps_mirror_upgrade
-          bazelisk run //bazel/ci:deps_mirror_upload
+          bazel run //bazel/ci:deps_mirror_upgrade
+          bazel run //bazel/ci:deps_mirror_upload
 
       - name: Run Bazel tidy
         shell: bash
-        run: bazelisk run //:tidy
+        run: bazel run //:tidy
 
       - name: Check if untidy
         id: untidy
@@ -75,7 +75,7 @@ jobs:
 
       - name: Run Bazel generate
         shell: bash
-        run: bazelisk run //:generate
+        run: bazel run //:generate
 
       - name: Check if ungenerated
         id: ungenerated
@@ -121,7 +121,7 @@ jobs:
 
       - name: Run Bazel check
         shell: bash
-        run: bazelisk run //:check
+        run: bazel run //:check
 
       # The following steps are only executed if the previous tidy check failed
       # and the action runs on an renovate branch. In this case, we tidy all
diff --git a/.github/workflows/test-unittest.yml b/.github/workflows/test-unittest.yml
index 11cfeda06..378aa3c8b 100644
--- a/.github/workflows/test-unittest.yml
+++ b/.github/workflows/test-unittest.yml
@@ -42,7 +42,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y libcryptsetup12 libcryptsetup-dev libvirt-dev
 
       - name: Create and populate build folder
-        run: mkdir build && cd build && cmake -DBAZEL:STRING=bazelisk ..
+        run: mkdir build && cd build && cmake ..
 
       - name: Unit Tests
         working-directory: build