Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
自由之枫~
opencv
提交
53f0be00
O
opencv
项目概览
自由之枫~
/
opencv
与 Fork 源项目一致
Fork自
OpenCV / opencv
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
53f0be00
编写于
5月 13, 2022
作者:
O
OpenCV Pushbot
提交者:
GitHub
5月 13, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #21975 from asenyaev:asen/fix_terminating_windows_actions
上级
f35ec8c9
2b5b192c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
8 deletion
+8
-8
.github/workflows/PR-3.4-W10.yaml
.github/workflows/PR-3.4-W10.yaml
+8
-8
未找到文件。
.github/workflows/PR-3.4-W10.yaml
浏览文件 @
53f0be00
...
...
@@ -30,25 +30,25 @@ jobs:
-
name
:
Clean
run
:
cd ${{ github.workspace }} && rm -rf *
-
name
:
Fetch opencv
run
:
cd ${{ github.workspace }} && git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv.git
https://github.com/
opencv/opencv.git
run
:
cd ${{ github.workspace }} && git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv.git
git@github.com:
opencv/opencv.git
-
name
:
Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch
run
:
|
cd ${{ github.workspace }}\opencv
git config user.email "opencv.ci"
git config user.name "opencv.ci"
git pull -v "
https://github.com/
${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}"
git pull -v "
git@github.com:
${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}"
-
name
:
Fetch opencv_extra
run
:
cd ${{ github.workspace }} && git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv_extra.git
https://github.com/
opencv/opencv_extra.git
run
:
cd ${{ github.workspace }} && git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv_extra.git
git@github.com:
opencv/opencv_extra.git
-
name
:
Merge opencv_extra with ${{ env.SOURCE_BRANCH_NAME }} branch
shell
:
bash
run
:
|
RET=$(git ls-remote --heads "
https://github.com/
${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}") || true
RET=$(git ls-remote --heads "
git@github.com:
${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}") || true
if [[ ! -z "$RET" ]]; then
echo "Merge opencv_extra with ${{ env.SOURCE_BRANCH_NAME }} branch"
cd opencv_extra
git config user.email "opencv.ci"
git config user.name "opencv.ci"
git pull -v "
https://github.com/
${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}"
git pull -v "
git@github.com:
${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}"
else
echo "No merge since ${{ env.PR_AUTHOR }}/opencv_extra does not have branch ${{ env.SOURCE_BRANCH_NAME }}"
fi
...
...
@@ -145,15 +145,15 @@ jobs:
-
name
:
Clean
run
:
cd ${{ github.workspace }} && rm -rf *
-
name
:
Fetch opencv
run
:
cd ${{ github.workspace }} && git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv.git
https://github.com/
opencv/opencv.git
run
:
cd ${{ github.workspace }} && git clone --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv.git
git@github.com:
opencv/opencv.git
-
name
:
Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch
run
:
|
cd ${{ github.workspace }}\opencv
git config user.email "opencv.ci"
git config user.name "opencv.ci"
git pull -v "
https://github.com/
${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}"
git pull -v "
git@github.com:
${{ env.PR_AUTHOR_FORK }}" "${{ env.SOURCE_BRANCH_NAME }}"
-
name
:
Fetch opencv_contrib
run
:
cd ${{ github.workspace }} && git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv_contrib.git --depth 1
https://github.com/
opencv/opencv_contrib.git
run
:
cd ${{ github.workspace }} && git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --reference ${{ env.GIT_CACHE }}\opencv_contrib.git --depth 1
git@github.com:
opencv/opencv_contrib.git
-
name
:
Configure OpenCV Contrib
run
:
|
mkdir ${{ github.workspace }}\opencv-contrib-build && cd ${{ github.workspace }}\opencv-contrib-build
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录