From b2ed34ff3381e9070b2cd3c86b00ea02581ee6e0 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:30:22 +0300 Subject: [PATCH] Fixing the build --- Dockerfile.jenkins | 7 ------- Jenkinsfile | 1 + Makefile | 6 ++++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index a25cd78..2db1854 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -2,10 +2,3 @@ FROM schemers/gauche RUN echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources.list RUN dpkg --add-architecture i386 RUN apt update && apt install -y wine32 wine64 make wget -RUN useradd jenkins -RUN mkdir -p /workdir && chmod -R 777 /workdir && chown jenkins:jenkins /workdir -WORKDIR /workdir -COPY ./executables/nsis-3.10-setup.exe /workdir/setup.exe -USER jenkins -RUN WINEPREFIX=/workdir/.wine wine setup.exe /S -ENV WINEPREFIX=/workdir/.wine diff --git a/Jenkinsfile b/Jenkinsfile index bd313bd..c50e7bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,7 @@ pipeline { stages { stage("Build") { steps { + sh 'make install-nsis' sh 'make' archiveArtifacts artifacts: 'setup_*.exe' } diff --git a/Makefile b/Makefile index 32bc9a3..5ef1f1c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ build: snow - whoami - wine makensis.exe install.nsi + wine ${HOME}/.wine/drive_c/Program\ Files\ \(x86\)/NSIS/makensis.exe install.nsi repo.scm: wget https://snow-fort.org/s/repo.scm @@ -11,6 +10,9 @@ urls.txt: repo.scm snow: urls.txt sh download.sh +install-nsis: + wine ./executables/nsis-3.10-setup.exe /S + clean: rm -rf repo.scm rm -rf snow