Fix buildDocker exit codes
This commit is contained in:
parent
4fe5071c8d
commit
f654aa3151
|
@ -37,7 +37,7 @@ jobs:
|
|||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v1.0.0
|
||||
with:
|
||||
name: Debuggable Installers Folder
|
||||
name: Debuggable Installers
|
||||
path: artifacts/
|
||||
|
||||
build-docker-release:
|
||||
|
@ -51,5 +51,5 @@ jobs:
|
|||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v1.0.0
|
||||
with:
|
||||
name: Releasable Installers Folder
|
||||
name: Releasable Installers
|
||||
path: artifacts/
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
FROM opensuse/tumbleweed
|
||||
|
||||
#RUN zypper -n install cmake make gcc gcc-c++ git dpkg binutils devscripts
|
||||
RUN zypper update
|
||||
RUN zypper -n update
|
||||
RUN zypper -n install cmake
|
||||
RUN zypper -n install make
|
||||
RUN zypper -n install gcc
|
||||
|
|
2
build.sh
2
build.sh
|
@ -3,5 +3,5 @@
|
|||
mkdir build
|
||||
cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Debug ..
|
||||
make -j5
|
||||
make -j$(nproc)
|
||||
cd ..
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
mkdir artifacts
|
||||
cd $1
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
./clean.sh
|
||||
docker build --tag fixmydlsbuilder .
|
||||
docker run -v $(pwd):/fixmydownloads fixmydlsbuilder Debug
|
||||
exit 0
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
./clean.sh
|
||||
docker build --tag fixmydlsbuilder .
|
||||
docker run -v $(pwd):/fixmydownloads fixmydlsbuilder Release
|
||||
exit 0
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
mkdir buildRelease
|
||||
cd buildRelease
|
||||
cmake -DCMAKE_BUILD_TYPE=Release ..
|
||||
make -j5
|
||||
make -j$(nproc)
|
||||
cd ..
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
[ $1 == "Debug" ] && cd build
|
||||
[ $1 == "Release" ] && cd buildRelease
|
||||
|
||||
make -j5 package
|
||||
make -j5 install
|
||||
make -j$(nproc) package
|
||||
make -j$(nproc) install
|
||||
cd ..
|
||||
|
||||
[ $1 == "Debug" ] && chmod -R 777 build bin
|
||||
|
|
Loading…
Reference in New Issue