Fix buildDocker exit codes

This commit is contained in:
realaltffour 2020-04-18 10:10:27 +03:00
parent 4fe5071c8d
commit f654aa3151
No known key found for this signature in database
GPG Key ID: 7115CD2AC9A76A56
8 changed files with 12 additions and 10 deletions

View File

@ -37,7 +37,7 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: Debuggable Installers Folder name: Debuggable Installers
path: artifacts/ path: artifacts/
build-docker-release: build-docker-release:
@ -51,5 +51,5 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: Releasable Installers Folder name: Releasable Installers
path: artifacts/ path: artifacts/

View File

@ -1,7 +1,7 @@
FROM opensuse/tumbleweed FROM opensuse/tumbleweed
#RUN zypper -n install cmake make gcc gcc-c++ git dpkg binutils devscripts #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 cmake
RUN zypper -n install make RUN zypper -n install make
RUN zypper -n install gcc RUN zypper -n install gcc

View File

@ -3,5 +3,5 @@
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_BUILD_TYPE=Debug .. cmake -DCMAKE_BUILD_TYPE=Debug ..
make -j5 make -j$(nproc)
cd .. cd ..

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
mkdir artifacts mkdir artifacts
cd $1 cd $1

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/sh
./clean.sh ./clean.sh
docker build --tag fixmydlsbuilder . docker build --tag fixmydlsbuilder .
docker run -v $(pwd):/fixmydownloads fixmydlsbuilder Debug docker run -v $(pwd):/fixmydownloads fixmydlsbuilder Debug
exit 0

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/sh
./clean.sh ./clean.sh
docker build --tag fixmydlsbuilder . docker build --tag fixmydlsbuilder .
docker run -v $(pwd):/fixmydownloads fixmydlsbuilder Release docker run -v $(pwd):/fixmydownloads fixmydlsbuilder Release
exit 0

View File

@ -3,5 +3,5 @@
mkdir buildRelease mkdir buildRelease
cd buildRelease cd buildRelease
cmake -DCMAKE_BUILD_TYPE=Release .. cmake -DCMAKE_BUILD_TYPE=Release ..
make -j5 make -j$(nproc)
cd .. cd ..

View File

@ -5,8 +5,8 @@
[ $1 == "Debug" ] && cd build [ $1 == "Debug" ] && cd build
[ $1 == "Release" ] && cd buildRelease [ $1 == "Release" ] && cd buildRelease
make -j5 package make -j$(nproc) package
make -j5 install make -j$(nproc) install
cd .. cd ..
[ $1 == "Debug" ] && chmod -R 777 build bin [ $1 == "Debug" ] && chmod -R 777 build bin