Skip to content

Commit 6c6c708

Browse files
committed
fixup! Add custom action and unified Linux build
1 parent 95cb139 commit 6c6c708

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

.github/workflows/OCV-PR-Linux.yaml

+17-16
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ concurrency:
2020

2121
jobs:
2222

23-
branch_eval:
24-
runs-on: ubuntu-latest
25-
outputs:
26-
branches: ${{ steps.determine-branches.outputs.branches }}
27-
steps:
28-
- id: determine-branches
29-
shell: bash
30-
run: |
31-
if [ "${{ github.event.repository.name == 'ci-gha-workflow' }}" = "true" ] ; then
32-
echo "branches=[ '4.x', '5.x' ]" >> "$GITHUB_OUTPUT"
33-
else
34-
echo "branches=[ '${{ github.base_ref }}' ]" >> "$GITHUB_OUTPUT"
35-
fi
23+
# branch_eval:
24+
# runs-on: ubuntu-latest
25+
# outputs:
26+
# branches: ${{ steps.determine-branches.outputs.branches }}
27+
# steps:
28+
# - id: determine-branches
29+
# shell: bash
30+
# run: |
31+
# if [ "${{ github.event.repository.name == 'ci-gha-workflow' }}" = "true" ] ; then
32+
# echo "branches=[ '4.x', '5.x' ]" >> "$GITHUB_OUTPUT"
33+
# else
34+
# echo "branches=[ '${{ github.base_ref }}' ]" >> "$GITHUB_OUTPUT"
35+
# fi
3636

3737
Ubuntu:
3838
# runs-on: opencv-ru-lin-riscv
3939
runs-on: opencv-cn-lin-x86-64
40-
needs:
41-
- branch_eval
40+
# needs:
41+
# - branch_eval
4242
strategy:
4343
# Debugging
4444
# fail-fast: true
@@ -50,7 +50,8 @@ jobs:
5050
- '24.04'
5151
- '22.04'
5252
- '20.04'
53-
branch: ${{ fromJSON(needs.branch_eval.outputs.branches )}}
53+
#branch: ${{ fromJSON(needs.branch_eval.outputs.branches )}}
54+
branch: [ ${{ github.event.repository.name == 'ci-gha-workflow' && '''4.x'', ''5.x''' || github.base_ref }} ]
5455
include:
5556
- version: '24.04'
5657
image: '24.04:20241031'

0 commit comments

Comments
 (0)