diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d36fde9..c5c6845 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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/ diff --git a/Dockerfile b/Dockerfile index dc51856..87d2ea4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/build.sh b/build.sh index 37ef690..da31b9f 100755 --- a/build.sh +++ b/build.sh @@ -3,5 +3,5 @@ mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Debug .. -make -j5 +make -j$(nproc) cd .. diff --git a/buildArtifacts.sh b/buildArtifacts.sh index 8d86ea6..dc3e049 100755 --- a/buildArtifacts.sh +++ b/buildArtifacts.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh mkdir artifacts cd $1 diff --git a/buildDocker.sh b/buildDocker.sh index 8514be4..4f66c24 100755 --- a/buildDocker.sh +++ b/buildDocker.sh @@ -1,5 +1,6 @@ -#!/bin/bash +#!/bin/sh ./clean.sh docker build --tag fixmydlsbuilder . docker run -v $(pwd):/fixmydownloads fixmydlsbuilder Debug +exit 0 diff --git a/buildDockerRelease.sh b/buildDockerRelease.sh index 870b170..92076e2 100755 --- a/buildDockerRelease.sh +++ b/buildDockerRelease.sh @@ -1,5 +1,6 @@ -#!/bin/bash +#!/bin/sh ./clean.sh docker build --tag fixmydlsbuilder . docker run -v $(pwd):/fixmydownloads fixmydlsbuilder Release +exit 0 diff --git a/buildRelease.sh b/buildRelease.sh index 72305b5..48ca57a 100755 --- a/buildRelease.sh +++ b/buildRelease.sh @@ -3,5 +3,5 @@ mkdir buildRelease cd buildRelease cmake -DCMAKE_BUILD_TYPE=Release .. -make -j5 +make -j$(nproc) cd .. diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index fed659f..478ba0e 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -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