File tree Expand file tree Collapse file tree 1 file changed +14
-29
lines changed
Expand file tree Collapse file tree 1 file changed +14
-29
lines changed Original file line number Diff line number Diff line change @@ -324,35 +324,20 @@ jobs:
324324 run : docker build -t ${{ env.docker-registry-container-sha }} -f ${{ env.dockerfile }} .
325325 working-directory : ${{ env.docker-config-path }}
326326 if : matrix.platform.container.name != '' && env.docker-container-exists != 'true'
327- - name : Build and test
328- run : |
329- export GITTEST_NEGOTIATE_PASSWORD="${{ secrets.GITTEST_NEGOTIATE_PASSWORD }}"
330-
331- if [ -n "${{ matrix.platform.container.name }}" ]; then
332- docker run \
333- --rm \
334- --user libgit2:libgit2 \
335- -v "$(pwd)/source:/home/libgit2/source" \
336- -w /home/libgit2 \
337- -e ASAN_SYMBOLIZER_PATH \
338- -e CC \
339- -e CFLAGS \
340- -e CMAKE_GENERATOR \
341- -e CMAKE_OPTIONS \
342- -e GITTEST_NEGOTIATE_PASSWORD \
343- -e GITTEST_FLAKY_STAT \
344- -e PKG_CONFIG_PATH \
345- -e SKIP_NEGOTIATE_TESTS \
346- -e SKIP_SSH_TESTS \
347- -e TSAN_OPTIONS \
348- ${{ env.docker-registry-container-sha }} \
349- /bin/bash -c "mkdir build && cd build && ../source/ci/build.sh && ../source/ci/test.sh"
350- else
351- mkdir build && cd build
352- ../source/ci/build.sh
353- ../source/ci/test.sh
354- fi
355- shell : bash
327+ - name : Prepare build
328+ run : mkdir build
329+ - name : Build
330+ uses : ./source/.github/actions/run-build
331+ with :
332+ command : cd build && ../source/ci/build.sh
333+ container : ${{ matrix.platform.container.name }}
334+ container-version : ${{ env.docker-registry-container-sha }}
335+ - name : Test
336+ uses : ./source/.github/actions/run-build
337+ with :
338+ command : cd build && ../source/ci/test.sh
339+ container : ${{ matrix.platform.container.name }}
340+ container-version : ${{ env.docker-registry-container-sha }}
356341
357342 coverity :
358343 # Only run scheduled workflows on the main repository; prevents people
You can’t perform that action at this time.
0 commit comments