mirror of
https://github.com/august-alt/gpui.git
synced 2025-03-11 00:58:44 +03:00
chore, build: update build process, revert to using rpm-build
This commit is contained in:
parent
01ec337039
commit
e6489c0597
@ -1,7 +1,7 @@
|
|||||||
%define _unpackaged_files_terminate_build 1
|
%define _unpackaged_files_terminate_build 1
|
||||||
|
|
||||||
Name: gpui
|
Name: gpui
|
||||||
Version: 0.2.15
|
Version: 0.2.17
|
||||||
Release: alt1
|
Release: alt1
|
||||||
|
|
||||||
Summary: Group policy editor
|
Summary: Group policy editor
|
||||||
|
21
Dockerfile
21
Dockerfile
@ -21,6 +21,25 @@ RUN apt-get update \
|
|||||||
rpm-macros-generic-compat \
|
rpm-macros-generic-compat \
|
||||||
apt-repo \
|
apt-repo \
|
||||||
apt-repo-tools \
|
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 \
|
sudo \
|
||||||
&& export CURRENT_PWD=`pwd` \
|
&& export CURRENT_PWD=`pwd` \
|
||||||
&& groupadd --gid $GROUP_ID builder2 \
|
&& 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
|
# Copies your code file from your action repository to the filesystem path `/` of the container
|
||||||
COPY script/build.sh /build.sh
|
COPY script/build.sh /build.sh
|
||||||
|
|
||||||
ARG ARCH
|
ARG ARCH
|
||||||
|
|
||||||
RUN if [ "$ARCH" = "i386" ]; then \
|
RUN if [ "$ARCH" = "i386" ]; then \
|
||||||
sed -i 's/gear-hsh/i586 gear-hsh/g' /build.sh; \
|
sed -i 's/gear-hsh/i586 gear-hsh/g' /build.sh; \
|
||||||
|
@ -1,13 +1,4 @@
|
|||||||
#!/bin/bash -ex
|
#!/bin/bash -ex
|
||||||
|
|
||||||
chown -R builder2:builder2 /app/
|
chown -R builder2:builder2 /app/
|
||||||
mkdir -p /app/RPMS/
|
cd /app/ && gear-rpm -ba
|
||||||
|
|
||||||
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/
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user