diff --git a/.gear/gpui.spec b/.gear/gpui.spec index 0f1df3f..a64b243 100644 --- a/.gear/gpui.spec +++ b/.gear/gpui.spec @@ -1,7 +1,7 @@ %define _unpackaged_files_terminate_build 1 Name: gpui -Version: 0.2.15 +Version: 0.2.17 Release: alt1 Summary: Group policy editor diff --git a/Dockerfile b/Dockerfile index 408f139..6ed9735 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,25 @@ RUN apt-get update \ rpm-macros-generic-compat \ apt-repo \ apt-repo-tools \ + cmake \ + rpm-macros-cmake \ + cmake-modules \ + gcc-c++ \ + qt5-base-devel \ + qt5-declarative-devel \ + qt5-tools-devel \ + libsmbclient-devel \ + libsmbclient \ + qt5-base-common \ + doxygen \ + libxerces-c-devel \ + xsd \ + boost-devel-headers \ + desktop-file-utils \ + ImageMagick-tools \ + libqt-mvvm-devel \ + xorg-xvfb \ + xvfb-run \ sudo \ && export CURRENT_PWD=`pwd` \ && groupadd --gid $GROUP_ID builder2 \ @@ -38,7 +57,7 @@ RUN apt-get update \ # Copies your code file from your action repository to the filesystem path `/` of the container COPY script/build.sh /build.sh -ARG ARCH +ARG ARCH RUN if [ "$ARCH" = "i386" ]; then \ sed -i 's/gear-hsh/i586 gear-hsh/g' /build.sh; \ diff --git a/script/build.sh b/script/build.sh index f0e48f7..e0cf2d2 100755 --- a/script/build.sh +++ b/script/build.sh @@ -1,13 +1,4 @@ #!/bin/bash -ex chown -R builder2:builder2 /app/ -mkdir -p /app/RPMS/ - -mkdir /home/builder2/hasher -mkdir /home/builder2/.hasher - -cp /app/hasher/config /home/builder2/.hasher/config -hsh --initroot-only --no-wait-lock -vv /home/builder2/hasher - -cd /app/ && gear --hasher -- hsh-rebuild /home/builder2/hasher -cp /home/builder2/hasher/repo/x86_64/RPMS.hasher/*.rpm /app/RPMS/ +cd /app/ && gear-rpm -ba