From ca16cbbed590a5be4893d6647cead28968f88ef1 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Sun, 24 Nov 2024 04:58:51 +0800
Subject: [PATCH] fix

---
 .github/workflows/build_and_test.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index e6cc6386628fc..126a03e84be5e 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -81,19 +81,21 @@ jobs:
           check-latest: false
       - name: Prepare Environment
         run: |
+          WORKING_DIR=$PWD
+          cd dev-support/docker
           export DEBIAN_FRONTEND=noninteractive
           export DEBCONF_TERSE=true
           ######
           # Platform package dependency resolver
           ######
-          chmod a+x dev-support/docker/pkg-resolver/*.sh pkg-resolver/*.py
-          chmod a+r dev-support/docker/pkg-resolver/*.json
+          chmod a+x pkg-resolver/*.sh pkg-resolver/*.py
+          chmod a+r pkg-resolver/*.json
           ######
           # Install packages from apt
           ######
           apt-get -q update
           apt-get -q install -y --no-install-recommends python3
-          apt-get -q install -y --no-install-recommends $(dev-support/docker/pkg-resolver/resolve.py ubuntu:focal)
+          apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py ubuntu:focal)
           apt-get clean
           rm -rf /var/lib/apt/lists/*
           RUN locale-gen en_US.UTF-8
@@ -117,12 +119,13 @@ jobs:
           #######
           # Install packages
           #######
-          dev-support/docker/pkg-resolver/install-common-pkgs.sh
-          dev-support/docker/pkg-resolver/install-spotbugs.sh ubuntu:focal
-          dev-support/docker/pkg-resolver/install-boost.sh ubuntu:focal
-          dev-support/docker/pkg-resolver/install-protobuf.sh ubuntu:focal
-          dev-support/docker/pkg-resolver/install-hadolint.sh ubuntu:focal
-          dev-support/docker/pkg-resolver/install-intel-isa-l.sh ubuntu:focal
+          pkg-resolver/install-common-pkgs.sh
+          pkg-resolver/install-spotbugs.sh ubuntu:focal
+          pkg-resolver/install-boost.sh ubuntu:focal
+          pkg-resolver/install-protobuf.sh ubuntu:focal
+          pkg-resolver/install-hadolint.sh ubuntu:focal
+          pkg-resolver/install-intel-isa-l.sh ubuntu:focal
+          cd $WORKING_DIR
       - name: Build
         run: mvn ${{ matrix.modules }} -Pnative clean install -am -DskipTests
       - name: Test