[llvm] [infra] Add git to Linux container (PR #82687)

Natalie Chouinard via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 4 07:35:44 PST 2024


https://github.com/sudonatalie updated https://github.com/llvm/llvm-project/pull/82687

>From b704e6d58152ceef9173029ff3b45260b2245b52 Mon Sep 17 00:00:00 2001
From: Natalie Chouinard <chouinard at google.com>
Date: Thu, 22 Feb 2024 21:07:24 +0000
Subject: [PATCH 1/3] [infra] Add git to Linux container

Fixes #82646
---
 .github/workflows/containers/github-action-ci/stage2.Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/containers/github-action-ci/stage2.Dockerfile b/.github/workflows/containers/github-action-ci/stage2.Dockerfile
index e1a06cb68a589e..0ca0da87734c4c 100644
--- a/.github/workflows/containers/github-action-ci/stage2.Dockerfile
+++ b/.github/workflows/containers/github-action-ci/stage2.Dockerfile
@@ -12,11 +12,13 @@ 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 \

>From a1765e531c5ac39b492f57976e19ff7623f4e6ef Mon Sep 17 00:00:00 2001
From: Natalie Chouinard <chouinard at google.com>
Date: Thu, 22 Feb 2024 21:17:37 +0000
Subject: [PATCH 2/3] Temp change to make SPIR-V Tests run on the PR

---
 llvm/test/CodeGen/SPIRV/basic_float_types.ll | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/llvm/test/CodeGen/SPIRV/basic_float_types.ll b/llvm/test/CodeGen/SPIRV/basic_float_types.ll
index 1c7a8a851f59c6..3c78150110bc2a 100644
--- a/llvm/test/CodeGen/SPIRV/basic_float_types.ll
+++ b/llvm/test/CodeGen/SPIRV/basic_float_types.ll
@@ -1,3 +1,5 @@
+; DONOTSUBMIT: Temp change to make SPIR-V Tests run on the PR.
+
 ; RUN: llc -O0 -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s
 ; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s
 ; RUN: llc -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s

>From 7898ca4c261cf080aa6da40137a536e391f87de2 Mon Sep 17 00:00:00 2001
From: Natalie Chouinard <chouinard at google.com>
Date: Mon, 26 Feb 2024 15:14:44 +0000
Subject: [PATCH 3/3] Revert "Temp change to make SPIR-V Tests run on the PR"

This reverts commit 5f285dded2b7bf0bf8d63f61b524719bce12673e.
---
 llvm/test/CodeGen/SPIRV/basic_float_types.ll | 2 --
 1 file changed, 2 deletions(-)

diff --git a/llvm/test/CodeGen/SPIRV/basic_float_types.ll b/llvm/test/CodeGen/SPIRV/basic_float_types.ll
index 3c78150110bc2a..1c7a8a851f59c6 100644
--- a/llvm/test/CodeGen/SPIRV/basic_float_types.ll
+++ b/llvm/test/CodeGen/SPIRV/basic_float_types.ll
@@ -1,5 +1,3 @@
-; DONOTSUBMIT: Temp change to make SPIR-V Tests run on the PR.
-
 ; RUN: llc -O0 -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s
 ; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s
 ; RUN: llc -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s



More information about the llvm-commits mailing list