Skip to content

Commit 0636643

Browse files
authored
[CI] fix workflow (#10861)
* fix workflow * remove codecov
1 parent e042ac1 commit 0636643

File tree

7 files changed

+17
-221
lines changed

7 files changed

+17
-221
lines changed

.github/workflows/distribute.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
if [[ -n "${IMAGE_NAME}" ]]; then
5050
echo "IMAGE_NAME=${IMAGE_NAME}" >> "$GITHUB_ENV"
5151
else
52-
echo "IMAGE_NAME=registry.baidubce.com/paddlepaddle/paddle:latest-dev-cuda11.8-cudnn8.6-trt8.5-gcc82" >> "$GITHUB_ENV"
52+
echo "IMAGE_NAME=registry.baidubce.com/paddlepaddle/paddle:latest-dev-cuda11.8-cudnn8.6-trt8.5-gcc82-latest" >> "$GITHUB_ENV"
5353
fi
5454
5555
- name: Run Container
@@ -83,7 +83,7 @@ jobs:
8383
-e paddle_whl \
8484
-e FLAGS_dynamic_static_unified_comm \
8585
-e python_version \
86-
-w /workspace --runtime=nvidia ${{ env.IMAGE_NAME }}
86+
-w /workspace --runtime=nvidia $IMAGE_NAME
8787
fi
8888
8989
- name: Download Code
@@ -136,17 +136,18 @@ jobs:
136136
- name: Upload Logs
137137
if: always()
138138
env:
139-
home_path: ${{ github.workspace }}/../../..
140-
bos_file: ${{ github.workspace }}/../../../bos/BosClient.py
139+
home_path: ${{ github.workspace }}/..
140+
bos_file: ${{ github.workspace }}/../bos_retry/BosClient.py
141141
run: |
142142
if [[ "$RUN_DOWNSTREAM" == "false" ]]; then
143143
echo "Not in a pull_request or test_build event. Skipping..."
144144
else
145145
docker exec -t $container_name /bin/bash -c '
146+
unset http_proxy && unset https_proxy
146147
if [ ! -f "${{ env.bos_file }}" ]; then
147-
wget -q --no-proxy -O ${{ env.home_path }}/bos_new.tar.gz https://xly-devops.bj.bcebos.com/home/bos_new.tar.gz --no-check-certificate
148-
mkdir ${{ env.home_path }}/bos
149-
tar xf ${{ env.home_path }}/bos_new.tar.gz -C ${{ env.home_path }}/bos
148+
wget -q --no-proxy -O ${{ env.home_path }}/bos_retry.tar.gz https://xly-devops.bj.bcebos.com/home/bos_retry.tar.gz --no-check-certificate
149+
mkdir ${{ env.home_path }}/bos_retry
150+
tar xf ${{ env.home_path }}/bos_retry.tar.gz -C ${{ env.home_path }}/bos_retry
150151
fi
151152
152153
if [[ "${{ env.RUN_DOWNSTREAM }}" == "" && -n "${PR_ID}" ]]; then
@@ -163,13 +164,11 @@ jobs:
163164
python ${{ env.bos_file }} $file paddle-github-action/PR/PaddleNLP/distribute/${bos_prefix}/logs
164165
echo "$file: https://paddle-github-action.bj.bcebos.com/PR/PaddleNLP/distribute/${bos_prefix}/logs/$file"
165166
done
166-
tar -czf products.tar.gz ./
167-
python ${{ env.bos_file }} products.tar.gz paddle-github-action/PR/PaddleNLP/distribute/${bos_prefix}/logs
168-
echo "products: https://paddle-github-action.bj.bcebos.com/PR/PaddleNLP/distribute/${bos_prefix}/logs/products.tar.gz"
169167
'
170168
fi
171169
172170
- name: Terminate And Delete the Container
173171
if: always()
174172
run: |
173+
docker exec -t ${{ env.container_name }} /bin/bash -c 'rm -rf * .[^.]*'
175174
docker rm -f $container_name 2>/dev/null || true

.github/workflows/unittest-cpu.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,13 @@ jobs:
9494
make test
9595
'
9696
97-
- name: Upload Coverage To Codecov
98-
uses: codecov/codecov-action@v3
99-
env:
100-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
101-
with:
102-
token: ${{ secrets.CODECOV_TOKEN }}
97+
# - name: Upload Coverage To Codecov
98+
# uses: codecov/codecov-action@v3
99+
# env:
100+
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
101+
# with:
102+
# token: ${{ secrets.CODECOV_TOKEN }}
103+
# files: ./PaddleNLP/coverage.xml
103104

104105
- name: Terminate And Delete the Container
105106
if: always()

.github/workflows/unittest-gpu.yml

Lines changed: 0 additions & 197 deletions
This file was deleted.

scripts/distribute/run_ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ get_diff_TO_case(){
106106
else
107107
cd ${nlp_dir}
108108
if [ $IS_A100 -ne 0 ];then
109-
for file_name in `git diff --numstat ${AGILE_COMPILE_BRANCH} |awk '{print $NF}'`;do
109+
for file_name in `git diff --numstat ${AGILE_COMPILE_BRANCH} -- |awk '{print $NF}'`;do
110110
arr_file_name=(${file_name//// })
111111
dir1=${arr_file_name[0]}
112112
dir2=${arr_file_name[1]}

scripts/regression/run_ci.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ all_P0case_dic=(["msra_ner"]=15
6363
["llm"]=5)
6464
####################################
6565

66-
python -m pip config --user unset global.index
67-
python -m pip config --user unset global.index-url
68-
python -m pip config --user unset global.trusted-host
6966
python -m pip config --user set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
7067
python -m pip config --user set global.trusted-host pypi.tuna.tsinghua.edu.cn
7168

scripts/unit_test/ci_unit.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ if [ ! -d "unittest_logs" ];then
2626
fi
2727

2828
install_requirements() {
29-
python -m pip config --user unset global.index
30-
python -m pip config --user unset global.index-url
31-
python -m pip config --user unset global.trusted-host
3229
python -m pip config --user set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
3330
python -m pip config --user set global.trusted-host pypi.tuna.tsinghua.edu.cn
3431
python -m pip install -r requirements.txt

tests/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@ paddleslim
2222
codecov-cli
2323
allure-pytest
2424
bce-python-sdk==0.8.74
25-
torchcodec

0 commit comments

Comments
 (0)