Skip to content

Commit ef83378

Browse files
ZePan110ZePan110
committed
c
Signed-off-by: ZePan110 <[email protected]>
1 parent 1160ecf commit ef83378

24 files changed

+42
-60
lines changed

‎.github/workflows/_build_image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
fi
7979
8080
- name: Checkout out GenAIExamples
81-
uses: actions/checkout@v4
81+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
8282
with:
8383
ref: ${{ env.CHECKOUT_REF }}
8484
fetch-depth: 0

‎.github/workflows/_get-image-list.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,10 @@ jobs:
3131
run_matrix: ${{ steps.get-matrix.outputs.run_matrix }}
3232
steps:
3333
- name: Checkout out Repo
34-
<<<<<<< HEAD
3534
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
3635

3736
- name: Checkout GenAIComps Repository
3837
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
39-
=======
40-
uses: actions/checkout@sha256:1e31de5234b9f8995739874a8ce0492dc87873e2
41-
42-
- name: Checkout GenAIComps Repository
43-
uses: actions/checkout@sha256:1e31de5234b9f8995739874a8ce0492dc87873e2
44-
>>>>>>> c7043a46317d46c39a90b9ad3efb18a91ac7f376
4538
with:
4639
repository: opea-project/GenAIComps
4740
path: GenAIComps
@@ -52,7 +45,7 @@ jobs:
5245
image_list=[]
5346
run_matrix="{\"include\":["
5447
if [[ ! -z "${{ inputs.examples }}" ]]; then
55-
pip install yq
48+
pip install yq==3.4.3
5649
examples=($(echo ${{ inputs.examples }} | tr ',' ' '))
5750
for example in ${examples[@]}
5851
do

‎.github/workflows/_get-test-matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
echo "checkout ref ${{ env.CHECKOUT_REF }}"
4848
4949
- name: Checkout out Repo
50-
uses: actions/checkout@v4
50+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
5151
with:
5252
ref: ${{ env.CHECKOUT_REF }}
5353
fetch-depth: 0

‎.github/workflows/_helm-e2e.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
echo "checkout ref ${CHECKOUT_REF}"
5656
5757
- name: Checkout Repo
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
5959
with:
6060
ref: ${{ steps.get-checkout-ref.outputs.CHECKOUT_REF }}
6161
fetch-depth: 0
@@ -128,7 +128,7 @@ jobs:
128128
echo "checkout ref ${CHECKOUT_REF}"
129129
130130
- name: Checkout Repo
131-
uses: actions/checkout@v4
131+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
132132
with:
133133
ref: ${{ steps.get-checkout-ref.outputs.CHECKOUT_REF }}
134134
fetch-depth: 0

‎.github/workflows/_run-docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
echo "checkout ref ${CHECKOUT_REF}"
6262
6363
- name: Checkout out Repo
64-
uses: actions/checkout@v4
64+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
6565
with:
6666
ref: ${{ steps.get-checkout-ref.outputs.CHECKOUT_REF }}
6767
fetch-depth: 0
@@ -150,7 +150,7 @@ jobs:
150150
docker images
151151
152152
- name: Checkout out Repo
153-
uses: actions/checkout@v4
153+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
154154
with:
155155
ref: ${{ needs.get-test-case.outputs.CHECKOUT_REF }}
156156
fetch-depth: 0
@@ -243,7 +243,7 @@ jobs:
243243
244244
- name: Publish pipeline artifact
245245
if: ${{ !cancelled() }}
246-
uses: actions/upload-artifact@v4
246+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
247247
with:
248248
name: ${{ inputs.hardware }}_${{ inputs.example }}_${{ matrix.test_case }}
249249
path: ${{ github.workspace }}/${{ inputs.example }}/tests/*.log

‎.github/workflows/_run-one-click.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ jobs:
5656
5757
- name: Checkout out Repo
5858
if: ${{ inputs.deploy_method == 'docker' }}
59-
<<<<<<< HEAD
6059
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
61-
=======
62-
uses: actions/checkout@sha256:1e31de5234b9f8995739874a8ce0492dc87873e2
63-
>>>>>>> c7043a46317d46c39a90b9ad3efb18a91ac7f376
6460
with:
6561
fetch-depth: 0
6662

@@ -94,11 +90,7 @@ jobs:
9490
9591
- name: Checkout out Repo
9692
if: ${{ inputs.deploy_method == 'k8s' }}
97-
<<<<<<< HEAD
9893
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
99-
=======
100-
uses: actions/checkout@sha256:1e31de5234b9f8995739874a8ce0492dc87873e2
101-
>>>>>>> c7043a46317d46c39a90b9ad3efb18a91ac7f376
10294
with:
10395
fetch-depth: 0
10496

@@ -216,11 +208,7 @@ jobs:
216208
217209
- name: Publish pipeline artifact
218210
if: ${{ !cancelled() }}
219-
<<<<<<< HEAD
220211
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
221-
=======
222-
uses: actions/upload-artifact@sha256:c7d193f32edcb7bfad88892161225aeda64e9392
223-
>>>>>>> c7043a46317d46c39a90b9ad3efb18a91ac7f376
224212
with:
225213
name: ${{ inputs.deploy_method }}
226214
path: ${{ github.workspace }}/${{ inputs.deploy_method }}-tests/test-results.log

‎.github/workflows/check-online-doc-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
steps:
1818

1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
2121
with:
2222
path: GenAIExamples
2323

2424
- name: Checkout docs
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
2626
with:
2727
repository: opea-project/docs
2828
path: docs

‎.github/workflows/daily-update-vllm-version.yml.disabled‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fail-fast: false
3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
3636
with:
3737
fetch-depth: 0
3838
ref: ${{ github.ref }}

‎.github/workflows/docker/code-scan.dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Copyright (C) 2024 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

4-
ARG UBUNTU_VER=22.04
4+
# ARG UBUNTU_VER=22.04
5+
ARG UBUNTU_VER=@sha256:4e0171b9275e12d375863f2b3ae9ce00a4c53ddda176bd55868df97ac6f21a6e
56
FROM ubuntu:${UBUNTU_VER} as devel
67

78
ENV LANG=C.UTF-8

‎.github/workflows/dockerhub-description.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,25 +84,25 @@ jobs:
8484
fail-fast: false
8585
steps:
8686
- name: Checkout GenAIExamples
87-
uses: actions/checkout@v4
87+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
8888
with:
8989
repository: opea-project/GenAIExamples
9090
path: GenAIExamples
9191

9292
- name: Checkout GenAIComps
93-
uses: actions/checkout@v4
93+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
9494
with:
9595
repository: opea-project/GenAIComps
9696
path: GenAIComps
9797

9898
- name: Checkout vllm-openvino
99-
uses: actions/checkout@v4
99+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
100100
with:
101101
repository: vllm-project/vllm
102102
path: vllm
103103

104104
- name: Checkout vllm-gaudi
105-
uses: actions/checkout@v4
105+
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2
106106
with:
107107
repository: HabanaAI/vllm-fork
108108
ref: habana_main

0 commit comments

Comments
 (0)