Mesa (main): ci/x86_build: Getting pushd popd be paired, avoid using cd

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jun 23 10:06:39 UTC 2022


Module: Mesa
Branch: main
Commit: 20a236c75579e0c5563fc9ae65739cc214b7ea2f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=20a236c75579e0c5563fc9ae65739cc214b7ea2f

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Sat May  7 06:48:57 2022 +0800

ci/x86_build: Getting pushd popd be paired, avoid using cd

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Acked-by: Jesse Natalie <jenatali at microsoft.com>
Acked-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16084>

---

 .gitlab-ci/container/debian/x86_build.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh
index 1c1f9f7b6be..8fa9f083a4d 100644
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -90,9 +90,8 @@ make
 popd
 
 git clone https://github.com/microsoft/DirectX-Headers -b v1.602.0-r1 --depth 1
-pushd DirectX-Headers
-mkdir build
-cd build
+mkdir -p DirectX-Headers/build
+pushd DirectX-Headers/build
 meson .. --backend=ninja --buildtype=release -Dbuild-test=false
 ninja
 ninja install



More information about the mesa-commit mailing list