Skip to content

Commit 0eabdbf

Browse files
ZePan110chensuyue
andauthored
Fix build fail for EdgeCraftRAG. (#2218)
Signed-off-by: ZePan110 <ze.pan@intel.com> Signed-off-by: chensuyue <suyue.chen@intel.com> Co-authored-by: chensuyue <suyue.chen@intel.com>
1 parent 2423906 commit 0eabdbf

4 files changed

Lines changed: 15 additions & 8 deletions

File tree

.github/workflows/pr-image-size.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
matrix:
4747
dockerfile: ${{ fromJson(needs.get-check-list.outputs.files) }}
4848
fail-fast: false
49-
# outputs:
50-
# comments: ${{ steps.build-check.outputs.comment_message }}
49+
outputs:
50+
skip: ${{ steps.build-check.outputs.skip }}
5151
steps:
5252
- name: Checkout PR branch
5353
uses: actions/checkout@v4
@@ -92,7 +92,11 @@ jobs:
9292
echo "Building base image for $dockerfile"
9393
git checkout ${{ github.event.pull_request.base.sha }}
9494
echo "::group::Build image_base"
95-
docker build -f $file -t "$image_base" --no-cache . || true
95+
if ! docker build -f "$file" -t "$image_base" --no-cache .; then
96+
echo "skip=true" >> $GITHUB_ENV
97+
echo "skip=true" >> $GITHUB_OUTPUT
98+
exit 0
99+
fi
96100
echo "::endgroup::"
97101
size_base=$(docker image inspect "$image_base" | jq '.[0].Size / (1024 * 1024) | round')
98102
@@ -123,19 +127,22 @@ jobs:
123127
echo "summary_path=${{github.workspace}}/build-$image_name.md" >> $GITHUB_ENV
124128
125129
- name: Download origin artifact log
130+
if: env.skip != 'true'
126131
uses: actions/download-artifact@v4
127132
with:
128133
name: build-comments
129134
path: merged-files
130135
continue-on-error: true
131136

132137
- name: Merge logs
138+
if: env.skip != 'true'
133139
run: |
134140
mkdir -p merged-files
135141
ls merged-files/
136142
cp ${{ env.summary_path }} merged-files/
137143
138144
- name: Save Summary as Artifact
145+
if: env.skip != 'true'
139146
uses: actions/upload-artifact@v4
140147
with:
141148
name: build-comments
@@ -146,7 +153,7 @@ jobs:
146153
needs: build-and-check
147154
permissions:
148155
actions: read
149-
if: always()
156+
if: always() && needs.build-and-check.outputs.skip != 'true'
150157
runs-on: ubuntu-latest
151158
outputs:
152159
all_comments: ${{ steps.summary.outputs.all_comments }}

EdgeCraftRAG/edgecraftrag/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ langchain-core==0.3.60
66
llama-index==0.12.41
77
llama-index-core==0.12.41
88
llama-index-embeddings-openvino==0.5.2
9-
llama-index-llms-openai==0.3.44
10-
llama-index-llms-openai-like==0.3.4
9+
llama-index-llms-openai==0.4.0
10+
llama-index-llms-openai-like==0.4.0
1111
llama-index-llms-openvino==0.4.0
1212
llama-index-postprocessor-openvino-rerank==0.4.1
1313
llama-index-readers-file==0.4.7

HybridRAG/docker_image_build/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
context: ../
1414
dockerfile: ./Dockerfile
1515
image: ${REGISTRY:-opea}/hybridrag:${TAG:-latest}
16-
text2cypher:
16+
text2cypher-gaudi:
1717
build:
1818
context: GenAIComps
1919
dockerfile: comps/text2cypher/src/Dockerfile.intel_hpu

HybridRAG/tests/test_compose_on_gaudi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function build_docker_images() {
3636
cd ../
3737

3838
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
39-
service_list="hybridrag hybridrag-ui dataprep retriever text2cypher vllm nginx"
39+
service_list="hybridrag hybridrag-ui dataprep retriever text2cypher-gaudi vllm nginx"
4040
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log 2>&1
4141

4242
docker images && sleep 1s

0 commit comments

Comments
 (0)