Drop unnecessary changes

AlexeySachkov · AlexeySachkov · commit 212efe7c8bf9 · 2025-03-31T03:07:42.000-07:00
diff --git a/.github/workflows/commit-access-review.py b/.github/workflows/commit-access-review.py
@@ -62,56 +62,93 @@ def __repr__(self):
         )
 
 
-def check_manual_requests(
-    gh: github.Github, start_date: datetime.datetime
-) -> list[str]:
+def run_graphql_query(
+    query: str, variables: dict, token: str, retry: bool = True
+) -> dict:
     """
-    Return a list of users who have been asked since ``start_date`` if they
-    want to keep their commit access or if they have applied for commit
-    access since ``start_date``
+    This function submits a graphql query and returns the results as a
+    dictionary.
     """
+    s = requests.Session()
+    retries = requests.adapters.Retry(total=8, backoff_factor=2, status_forcelist=[504])
+    s.mount("https://", requests.adapters.HTTPAdapter(max_retries=retries))
+
+    headers = {
+        "Authorization": "bearer {}".format(token),
+        # See
+        # https://github.blog/2021-11-16-graphql-global-id-migration-update/
+        "X-Github-Next-Global-ID": "1",
+    }
+    request = s.post(
+        url="https://api.github.com/graphql",
+        json={"query": query, "variables": variables},
+        headers=headers,
+    )
+
+    rate_limit = request.headers.get("X-RateLimit-Remaining")
+    print(rate_limit)
+    if rate_limit and int(rate_limit) < 10:
+        reset_time = int(request.headers["X-RateLimit-Reset"])
+        while reset_time - int(time.time()) > 0:
+            time.sleep(60)
+            print(
+                "Waiting until rate limit reset",
+                reset_time - int(time.time()),
+                "seconds remaining",
+            )
+
+    if request.status_code == 200:
+        if "data" not in request.json():
+            print(request.json())
+            sys.exit(1)
+        return request.json()["data"]
+    elif retry:
+        return run_graphql_query(query, variables, token, False)
+    else:
+        raise Exception(
+            "Failed to run graphql query\nquery: {}\nerror: {}".format(
+                query, request.json()
+            )
+        )
+
 
+def check_manual_requests(start_date: datetime.datetime, token: str) -> list[str]:
+    """
+    Return a list of users who have been asked since ``start_date`` if they
+    want to keep their commit access.
+    """
     query = """
-        query ($query: String!, $after: String) {
-          search(query: $query, type: ISSUE, first: 100, after: $after) {
+        query ($query: String!) {
+          search(query: $query, type: ISSUE, first: 100) {
             nodes {
               ... on Issue {
-                author {
-                  login
-                }
                 body
+                comments (first: 100) {
+                  nodes {
+                    author {
+                      login
+                    }
+                  }
+                }
               }
             }
-            pageInfo {
-              hasNextPage
-              endCursor
-            }
           }
         }
         """
     formatted_start_date = start_date.strftime("%Y-%m-%dT%H:%M:%S")
     variables = {
-        "query": f"type:issue created:>{formatted_start_date} org:llvm repo:llvm-project label:infra:commit-access,infra:commit-access-request"
+        "query": f"type:issue created:>{formatted_start_date} org:llvm repo:llvm-project label:infrastructure:commit-access"
     }
 
-    has_next_page = True
+    data = run_graphql_query(query, variables, token)
     users = []
-    while has_next_page:
-        res_header, res_data = gh._Github__requester.graphql_query(
-            query=query, variables=variables
-        )
-        data = res_data["data"]
-        for issue in data["search"]["nodes"]:
-            users.extend([user[1:] for user in re.findall("@[^ ,\n]+", issue["body"])])
-            if issue["author"]:
-                users.append(issue["author"]["login"])
-        has_next_page = data["search"]["pageInfo"]["hasNextPage"]
-        if has_next_page:
-            variables["after"] = data["search"]["pageInfo"]["endCursor"]
+    for issue in data["search"]["nodes"]:
+        users.extend([user[1:] for user in re.findall("@[^ ,\n]+", issue["body"])])
+
     return users
 
 
-def get_num_commits(gh: github.Github, user: str, start_date: datetime.datetime) -> int:
+def get_num_commits(user: str, start_date: datetime.datetime, token: str) -> int:
     """
     Get number of commits that ``user`` has been made since ``start_date`.
     """
@@ -129,10 +166,7 @@ def get_num_commits(gh: github.Github, user: str, start_date: datetime.datetime)
         }
     """
 
-    res_header, res_data = gh._Github__requester.graphql_query(
-        query=user_query, variables=variables
-    )
-    data = res_data["data"]
+    data = run_graphql_query(user_query, variables, token)
     variables["user_id"] = data["user"]["id"]
 
     query = """
@@ -159,10 +193,7 @@ def get_num_commits(gh: github.Github, user: str, start_date: datetime.datetime)
         }
      """
     count = 0
-    res_header, res_data = gh._Github__requester.graphql_query(
-        query=query, variables=variables
-    )
-    data = res_data["data"]
+    data = run_graphql_query(query, variables, token)
     for repo in data["organization"]["teams"]["nodes"][0]["repositories"]["nodes"]:
         count += int(repo["ref"]["target"]["history"]["totalCount"])
         if count >= User.THRESHOLD:
@@ -171,7 +202,7 @@ def get_num_commits(gh: github.Github, user: str, start_date: datetime.datetime)
 
 
 def is_new_committer_query_repo(
-    gh: github.Github, user: str, start_date: datetime.datetime
+    user: str, start_date: datetime.datetime, token: str
 ) -> bool:
     """
     Determine if ``user`` is a new committer.  A new committer can keep their
@@ -189,10 +220,7 @@ def is_new_committer_query_repo(
         }
     """
 
-    res_header, res_data = gh._Github__requester.graphql_query(
-        query=user_query, variables=variables
-    )
-    data = res_data["data"]
+    data = run_graphql_query(user_query, variables, token)
     variables["owner"] = "llvm"
     variables["user_id"] = data["user"]["id"]
     variables["start_date"] = start_date.strftime("%Y-%m-%dT%H:%M:%S")
@@ -217,10 +245,7 @@ def is_new_committer_query_repo(
         }
      """
 
-    res_header, res_data = gh._Github__requester.graphql_query(
-        query=query, variables=variables
-    )
-    data = res_data["data"]
+    data = run_graphql_query(query, variables, token)
     repo = data["organization"]["repository"]
     commits = repo["ref"]["target"]["history"]["nodes"]
     if len(commits) == 0:
@@ -231,22 +256,18 @@ def is_new_committer_query_repo(
     return True
 
 
-def is_new_committer(
-    gh: github.Github, user: str, start_date: datetime.datetime
-) -> bool:
+def is_new_committer(user: str, start_date: datetime.datetime, token: str) -> bool:
     """
     Wrapper around is_new_commiter_query_repo to handle exceptions.
     """
     try:
-        return is_new_committer_query_repo(gh, user, start_date)
+        return is_new_committer_query_repo(user, start_date, token)
     except:
         pass
     return True
 
 
-def get_review_count(
-    gh: github.Github, user: str, start_date: datetime.datetime
-) -> int:
+def get_review_count(user: str, start_date: datetime.datetime, token: str) -> int:
     """
     Return the number of reviews that ``user`` has done since ``start_date``.
     """
@@ -265,14 +286,11 @@ def get_review_count(
         "query": f"type:pr commenter:{user} -author:{user} merged:>{formatted_start_date} org:llvm",
     }
 
-    res_header, res_data = gh._Github__requester.graphql_query(
-        query=query, variables=variables
-    )
-    data = res_data["data"]
+    data = run_graphql_query(query, variables, token)
     return int(data["search"]["issueCount"])
 
 
-def count_prs(gh: github.Github, triage_list: dict, start_date: datetime.datetime):
+def count_prs(triage_list: dict, start_date: datetime.datetime, token: str):
     """
     Fetch all the merged PRs for the project since ``start_date`` and update
     ``triage_list`` with the number of PRs merged for each user.
@@ -311,10 +329,7 @@ def count_prs(gh: github.Github, triage_list: dict, start_date: datetime.datetim
         has_next_page = True
         while has_next_page:
             print(variables)
-            res_header, res_data = gh._Github__requester.graphql_query(
-                query=query, variables=variables
-            )
-            data = res_data["data"]
+            data = run_graphql_query(query, variables, token)
             for pr in data["search"]["nodes"]:
                 # Users can be None if the user has been deleted.
                 if not pr["author"]:
@@ -350,14 +365,14 @@ def main():
 
     print("Start:", len(triage_list), "triagers")
     # Step 0 Check if users have requested commit access in the last year.
-    for user in check_manual_requests(gh, one_year_ago):
+    for user in check_manual_requests(one_year_ago, token):
         if user in triage_list:
             print(user, "requested commit access in the last year.")
             del triage_list[user]
     print("After Request Check:", len(triage_list), "triagers")
 
     # Step 1 count all PRs authored or merged
-    count_prs(gh, triage_list, one_year_ago)
+    count_prs(triage_list, one_year_ago, token)
 
     print("After PRs:", len(triage_list), "triagers")
 
@@ -366,7 +381,7 @@ def main():
 
     # Step 2 check for reviews
     for user in list(triage_list.keys()):
-        review_count = get_review_count(gh, user, one_year_ago)
+        review_count = get_review_count(user, one_year_ago, token)
         triage_list[user].add_reviewed(review_count)
 
     print("After Reviews:", len(triage_list), "triagers")
@@ -376,7 +391,7 @@ def main():
 
     # Step 3 check for number of commits
     for user in list(triage_list.keys()):
-        num_commits = get_num_commits(gh, user, one_year_ago)
+        num_commits = get_num_commits(user, one_year_ago, token)
         # Override the total number of commits to not double count commits and
         # authored PRs.
         triage_list[user].set_authored(num_commits)
@@ -386,7 +401,7 @@ def main():
     # Step 4 check for new committers
     for user in list(triage_list.keys()):
         print("Checking", user)
-        if is_new_committer(gh, user, one_year_ago):
+        if is_new_committer(user, one_year_ago, token):
             print("Removing new committer: ", user)
             del triage_list[user]
 
diff --git a/.github/workflows/containers/github-action-ci/bootstrap.patch b/.github/workflows/containers/github-action-ci/bootstrap.patch
@@ -0,0 +1,13 @@
+diff --git a/clang/cmake/caches/BOLT-PGO.cmake b/clang/cmake/caches/BOLT-PGO.cmake
+index 1a04ca9a74e5..d092820e4115 100644
+--- a/clang/cmake/caches/BOLT-PGO.cmake
++++ b/clang/cmake/caches/BOLT-PGO.cmake
+@@ -4,6 +4,8 @@ set(CLANG_BOOTSTRAP_TARGETS
+   stage2-clang-bolt
+   stage2-distribution
+   stage2-install-distribution
++  clang
++  lld
+   CACHE STRING "")
+ set(BOOTSTRAP_CLANG_BOOTSTRAP_TARGETS
+   clang-bolt
diff --git a/.github/workflows/containers/github-action-ci/stage1.Dockerfile b/.github/workflows/containers/github-action-ci/stage1.Dockerfile
@@ -0,0 +1,42 @@
+FROM docker.io/library/ubuntu:22.04 as base
+ENV LLVM_SYSROOT=/opt/llvm
+
+FROM base as stage1-toolchain
+ENV LLVM_VERSION=18.1.8
+
+RUN apt-get update && \
+    apt-get install -y \
+    wget \
+    gcc \
+    g++ \
+    cmake \
+    ninja-build \
+    python3 \
+    git \
+    curl
+
+RUN curl -O -L https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$LLVM_VERSION.tar.gz && tar -xf llvmorg-$LLVM_VERSION.tar.gz
+
+WORKDIR /llvm-project-llvmorg-$LLVM_VERSION
+
+COPY bootstrap.patch /
+
+# TODO(boomanaiden154): Remove the bootstrap patch once we unsplit the build
+# and no longer need to explicitly build the stage2 dependencies.
+RUN cat /bootstrap.patch | patch -p1
+
+RUN mkdir build
+
+RUN cmake -B ./build -G Ninja ./llvm \
+  -C ./clang/cmake/caches/BOLT-PGO.cmake \
+  -DBOOTSTRAP_LLVM_ENABLE_LLD=ON \
+  -DBOOTSTRAP_BOOTSTRAP_LLVM_ENABLE_LLD=ON \
+  -DPGO_INSTRUMENT_LTO=Thin \
+  -DLLVM_ENABLE_RUNTIMES="compiler-rt" \
+  -DCMAKE_INSTALL_PREFIX="$LLVM_SYSROOT" \
+  -DLLVM_ENABLE_PROJECTS="bolt;clang;lld;clang-tools-extra" \
+  -DLLVM_DISTRIBUTION_COMPONENTS="lld;compiler-rt;clang-format;scan-build" \
+  -DCLANG_DEFAULT_LINKER="lld" \
+  -DBOOTSTRAP_CLANG_PGO_TRAINING_DATA_SOURCE_DIR=/llvm-project-llvmorg-$LLVM_VERSION/llvm
+
+RUN ninja -C ./build stage2-instrumented-clang stage2-instrumented-lld
diff --git a/.github/workflows/containers/github-action-ci/stage2.Dockerfile b/.github/workflows/containers/github-action-ci/stage2.Dockerfile
@@ -0,0 +1,29 @@
+FROM docker.io/library/ubuntu:22.04 as base
+ENV LLVM_SYSROOT=/opt/llvm
+
+FROM stage1-toolchain AS stage2-toolchain
+
+RUN ninja -C ./build stage2-clang-bolt stage2-install-distribution && ninja -C ./build install-distribution && rm -rf ./build
+
+FROM base
+
+COPY --from=stage2-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
+
+# Need to install curl for hendrikmuhs/ccache-action
+# Need nodejs for some of the GitHub actions.
+# Need perl-modules for clang analyzer tests.
+# Need git for SPIRV-Tools tests.
+RUN apt-get update && \
+    apt-get install -y \
+    binutils \
+    cmake \
+    curl \
+    git \
+    libstdc++-11-dev \
+    ninja-build \
+    nodejs \
+    perl-modules \
+    python3-psutil
+
+ENV LLVM_SYSROOT=$LLVM_SYSROOT
+ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
diff --git a/.github/workflows/containers/github-action-ci/storage.conf b/.github/workflows/containers/github-action-ci/storage.conf
@@ -0,0 +1,4 @@
+[storage]
+  driver = "overlay"
+  runroot = "/mnt/podman/container"
+  graphroot = "/mnt/podman/image"
