kopia lustrzana https://github.com/OpenDroneMap/ODM
Merge pull request #1198 from diddledan/fix-race-condition
Fix Buildtime Race Conditionpull/1197/head^2
commit
dc0e699c0b
|
@ -32,7 +32,7 @@ jobs:
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v2
|
||||||
with:
|
with:
|
||||||
file: ./portable.Dockerfile
|
file: ./portable.Dockerfile
|
||||||
platforms: linux/amd64,linux/386
|
platforms: linux/amd64
|
||||||
push: true
|
push: true
|
||||||
load: true # Copy to the host's docker daemon so we can use it for WSL export
|
load: true # Copy to the host's docker daemon so we can use it for WSL export
|
||||||
tags: ${{ steps.docker_meta.outputs.tags }}
|
tags: ${{ steps.docker_meta.outputs.tags }}
|
||||||
|
|
|
@ -159,5 +159,5 @@ externalproject_add(lastools
|
||||||
UPDATE_COMMAND ""
|
UPDATE_COMMAND ""
|
||||||
BUILD_IN_SOURCE 1
|
BUILD_IN_SOURCE 1
|
||||||
BUILD_COMMAND make -C LASlib -j${nproc} CXXFLAGS='-std=c++11' && make -C src -j${nproc} CXXFLAGS='-std=c++11' lasmerge
|
BUILD_COMMAND make -C LASlib -j${nproc} CXXFLAGS='-std=c++11' && make -C src -j${nproc} CXXFLAGS='-std=c++11' lasmerge
|
||||||
INSTALL_COMMAND mkdir -p ${SB_INSTALL_DIR}/bin && mv ${SB_SOURCE_DIR}/lastools/bin/lasmerge ${SB_INSTALL_DIR}/bin
|
INSTALL_COMMAND install -m755 -D -t ${SB_INSTALL_DIR}/bin ${SB_SOURCE_DIR}/lastools/bin/lasmerge
|
||||||
)
|
)
|
||||||
|
|
Ładowanie…
Reference in New Issue