diff --git a/.github/workflows/smoke_test_pip_cli_sp_linux.yml b/.github/workflows/smoke_test_pip_cli_sp_linux.yml index f187bf465d..c86b77c12d 100644 --- a/.github/workflows/smoke_test_pip_cli_sp_linux.yml +++ b/.github/workflows/smoke_test_pip_cli_sp_linux.yml @@ -54,21 +54,16 @@ jobs: echo ${{ steps.extract_branch.outputs.branch }} if [[ ${{ steps.extract_branch.outputs.branch }} == "master" ]]; then echo "running on master" - path=/home/actions-runner/fedml-master + path=/home/fedml/FedML cd $path + git pull echo "dir=$path" >> $GITHUB_OUTPUT else echo "running on dev" - root_path=/home/fedml - cd $root_path - # 检查目标目录是否存在 - if [ -d "FedML" ]; then - git pull - git checkout dev/v0.7.0 - fi - git clone -b dev/v0.7.0 --single-branch https://github.com/Qigemingziba/FedML.git - cd FedML path=/home/fedml/FedML + cd $path + git pull + git checkout ${{ steps.extract_branch.outputs.branch }} echo "dir=$path" >> $GITHUB_OUTPUT fi - name: sync git repo to local pip diff --git a/devops/dockerfile/github-action-runner/DockerfileWx b/devops/dockerfile/github-action-runner/DockerfileLight similarity index 96% rename from devops/dockerfile/github-action-runner/DockerfileWx rename to devops/dockerfile/github-action-runner/DockerfileLight index 66c9098696..a83b3c2a32 100644 --- a/devops/dockerfile/github-action-runner/DockerfileWx +++ b/devops/dockerfile/github-action-runner/DockerfileLight @@ -35,7 +35,6 @@ RUN git clone https://github.com/Qigemingziba/FedML.git #USER docker # RUN cd FedML/python && pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -e ./ --use-deprecated=legacy-resolver -ENV REPO=Qigemingziba/FedML ACCESS_TOKEN=AGMK3P54EHEPHNRPWRQ3IJLGNARAS +ENV REPO=Qigemingziba/FedML ACCESS_TOKEN=AGMK3P6YMJOZV4VKATVVRWDGNETGW # set the entrypoint to the start.sh script CMD ./start.sh ${REPO} ${ACCESS_TOKEN} - diff --git a/devops/dockerfile/github-action-runner/build_light.sh b/devops/dockerfile/github-action-runner/build_light.sh new file mode 100755 index 0000000000..e66dd7d4ca --- /dev/null +++ b/devops/dockerfile/github-action-runner/build_light.sh @@ -0,0 +1,6 @@ +# --exclude='path/to/excluded/dir' +# git clone https://github.com/Qigemingziba/FedML.git +# git checkout dev/v0.7.0 +docker login +docker build -t fedml/github-action-runner_wx:test -f ./DockerfileLight . +docker run --rm fedml/github-action-runner_wx:test \ No newline at end of file diff --git a/devops/dockerfile/github-action-runner/build_wx_test.sh b/devops/dockerfile/github-action-runner/build_wx_test.sh deleted file mode 100755 index 9d1e66576d..0000000000 --- a/devops/dockerfile/github-action-runner/build_wx_test.sh +++ /dev/null @@ -1,7 +0,0 @@ -# --exclude='path/to/excluded/dir' -# git clone https://github.com/Qigemingziba/FedML.git -# git checkout dev/v0.7.0 - -docker build -t fedml/github-action-runner_wx:test2 -f ./DockerfileWx . - -docker run --rm fedml/github-action-runner_wx:test2 \ No newline at end of file