From deb04fdcb09859fcb41f465d442a2d5f1d9a8131 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 11 Oct 2024 14:19:47 +0300 Subject: [PATCH 01/28] Fixing the build --- Dockerfile.jenkins | 3 ++- README.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 8499c3a..c3d61a4 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -1,5 +1,6 @@ FROM schemers/gauche RUN echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources.list -RUN apt update && apt install -y wine +RUN dpkg --add-architecture i386 +RUN apt update && apt install -y wine32 wine64 COPY ./executables/nsis-3.10-setup.exe /setup.exe RUN wine setup.exe /S diff --git a/README.md b/README.md index e4ec726..9d21e92 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,9 @@ there might be more than one implementation. ## Installation -Download the latest setup executable from Jenkins and run it. +Download the latest setup executable from +[Jenkins](https://jenkins.scheme.org/job/rinne/job/snow-fort-windows-installer/job/release) +and run it. ## Using the libraries -- 2.40.1 From 1201d1d73e7051c49642ee8925c8c0dc026b9765 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 11 Oct 2024 22:14:26 +0300 Subject: [PATCH 02/28] Fixing the build --- Dockerfile.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index c3d61a4..f591d6d 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -1,6 +1,6 @@ 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 +RUN apt update && apt install -y wine32 wine64 make COPY ./executables/nsis-3.10-setup.exe /setup.exe RUN wine setup.exe /S -- 2.40.1 From 90e81467b32da699c707668055b50b1d9cb32a34 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 11 Oct 2024 22:27:09 +0300 Subject: [PATCH 03/28] Add environment variable for library path --- README.md | 4 ++-- install.nsi | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d21e92..7a95ecb 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ and run it. Add the installation path to your implementations load path: - %ProgramFiles%/snow + %SNOW_LIBRARY_PATH% For example with Gauche: - gosh.exe -r7 -A "%ProgramFiles%/snow" main.scm + gosh.exe -r7 -A "%SNOW_LIBRARY_PATH%" main.scm diff --git a/install.nsi b/install.nsi index bba4f43..07de8a1 100644 --- a/install.nsi +++ b/install.nsi @@ -1,3 +1,5 @@ + + OutFile "setup_snow.exe" InstallDir "$PROGRAMFILES64" @@ -6,5 +8,13 @@ Section RMDir "$INSTDIR" File /r "snow" Push "$INSTDIR" + + !include "winmessages.nsh" + !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' + !define env_hkcu 'HKCU "Environment"' + + WriteRegExpandStr ${env_hklm} SNOW_LIBRARY_PATH "$PROGRAMFILES64/snow" + WriteRegExpandStr ${env_hkcu} SNOW_LIBRARY_PATH "$PROGRAMFILES64/snow" + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 SectionEnd -- 2.40.1 From d8be0483b46e0e973e681f3cb99dd88158d0e515 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 11 Oct 2024 22:44:17 +0300 Subject: [PATCH 04/28] Add environment variable for library path --- Dockerfile.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index f591d6d..7291fd7 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -1,6 +1,6 @@ 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 +RUN apt update && apt install -y wine32 wine64 make wget COPY ./executables/nsis-3.10-setup.exe /setup.exe RUN wine setup.exe /S -- 2.40.1 From cbcca22219cb9a430e387b21fce6bc133f973017 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 11 Oct 2024 22:59:54 +0300 Subject: [PATCH 05/28] Fixing the build --- Dockerfile.jenkins | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 7291fd7..3e18bf8 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -3,4 +3,5 @@ RUN echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources. RUN dpkg --add-architecture i386 RUN apt update && apt install -y wine32 wine64 make wget COPY ./executables/nsis-3.10-setup.exe /setup.exe +RUN wine winecfg RUN wine setup.exe /S -- 2.40.1 From 4acd107defcc9c1132b75652e7000498f84d2eed Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 06:53:59 +0300 Subject: [PATCH 06/28] Fixing the build --- Dockerfile.jenkins | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 3e18bf8..9395fa3 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -3,5 +3,5 @@ RUN echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources. RUN dpkg --add-architecture i386 RUN apt update && apt install -y wine32 wine64 make wget COPY ./executables/nsis-3.10-setup.exe /setup.exe -RUN wine winecfg -RUN wine setup.exe /S +RUN WINEPREFIX=/wine wine winecfg +RUN WINEPREFIX=/wine wine setup.exe /S -- 2.40.1 From ed2eb996300044e97e0eac3d9c3abbe29b2af285 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:05:13 +0300 Subject: [PATCH 07/28] Fixing the build --- Dockerfile.jenkins | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 9395fa3..94785b3 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -3,5 +3,7 @@ RUN echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources. RUN dpkg --add-architecture i386 RUN apt update && apt install -y wine32 wine64 make wget COPY ./executables/nsis-3.10-setup.exe /setup.exe -RUN WINEPREFIX=/wine wine winecfg -RUN WINEPREFIX=/wine wine setup.exe /S +RUN mkidr -p /.wine +RUN wine winecfg +RUN wine wine setup.exe /S +ENV HOME=/ -- 2.40.1 From 3b6149e4db01265996a145e949ed2f40c391fcd5 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:05:29 +0300 Subject: [PATCH 08/28] Fixing the build --- Dockerfile.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 94785b3..8fb2224 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -6,4 +6,4 @@ COPY ./executables/nsis-3.10-setup.exe /setup.exe RUN mkidr -p /.wine RUN wine winecfg RUN wine wine setup.exe /S -ENV HOME=/ +ENV HOME=/root -- 2.40.1 From 3527b0ededa1e8477f8a6733b0596c9b2dc10f26 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:05:53 +0300 Subject: [PATCH 09/28] Fixing the build --- Dockerfile.jenkins | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 8fb2224..b619d25 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -3,7 +3,6 @@ RUN echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources. RUN dpkg --add-architecture i386 RUN apt update && apt install -y wine32 wine64 make wget COPY ./executables/nsis-3.10-setup.exe /setup.exe -RUN mkidr -p /.wine RUN wine winecfg RUN wine wine setup.exe /S ENV HOME=/root -- 2.40.1 From d47adbc3c3bdbf99e07e48cbdb548cfe50b23370 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:06:34 +0300 Subject: [PATCH 10/28] Fixing the build --- Dockerfile.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index b619d25..eaf7edd 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -4,5 +4,5 @@ RUN dpkg --add-architecture i386 RUN apt update && apt install -y wine32 wine64 make wget COPY ./executables/nsis-3.10-setup.exe /setup.exe RUN wine winecfg -RUN wine wine setup.exe /S +RUN wine setup.exe /S ENV HOME=/root -- 2.40.1 From d1128370673da9c1d5fee41c68783d7339e4a827 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:08:09 +0300 Subject: [PATCH 11/28] Fixing the build --- Dockerfile.jenkins | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index eaf7edd..6ad67ce 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -3,6 +3,7 @@ RUN echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources. RUN dpkg --add-architecture i386 RUN apt update && apt install -y wine32 wine64 make wget COPY ./executables/nsis-3.10-setup.exe /setup.exe +RUN mkdir -p /root/.wine && chmod 755 /root/.wine RUN wine winecfg RUN wine setup.exe /S ENV HOME=/root -- 2.40.1 From 9a9e164dac9ea9d24186466fff36af27561097b6 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:09:21 +0300 Subject: [PATCH 12/28] Fixing the build --- Dockerfile.jenkins | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 6ad67ce..a0aeb1b 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -3,7 +3,8 @@ RUN echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources. RUN dpkg --add-architecture i386 RUN apt update && apt install -y wine32 wine64 make wget COPY ./executables/nsis-3.10-setup.exe /setup.exe -RUN mkdir -p /root/.wine && chmod 755 /root/.wine +RUN mkdir -p /root/.wine RUN wine winecfg RUN wine setup.exe /S +RUN chmod 755 -R /root/.wine ENV HOME=/root -- 2.40.1 From d33154d5ccd040d98a4b4dc9d72c056fc95dbb58 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:12:58 +0300 Subject: [PATCH 13/28] Fixing the build --- Dockerfile.jenkins | 10 ++++------ Jenkinsfile | 1 - Makefile | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index a0aeb1b..fedc71c 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -2,9 +2,7 @@ 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 -COPY ./executables/nsis-3.10-setup.exe /setup.exe -RUN mkdir -p /root/.wine -RUN wine winecfg -RUN wine setup.exe /S -RUN chmod 755 -R /root/.wine -ENV HOME=/root +WORKDIR /workdir +COPY ./executables/nsis-3.10-setup.exe /workdir/setup.exe +RUN WINEPREFIX=/workdir/.wine wine setup.exe /S +ENV WINEPREFIX=/workdir/.wine diff --git a/Jenkinsfile b/Jenkinsfile index 418a629..bd313bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,6 @@ pipeline { dockerfile { filename 'Dockerfile.jenkins' dir '.' - args '--privileged -v /var/run/docker.sock:/var/run/docker.sock' } } diff --git a/Makefile b/Makefile index 6830389..26dabc9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ build: snow - wine ${HOME}/.wine/drive_c/Program\ Files\ \(x86\)/NSIS/makensis.exe install.nsi + wine makensis.exe install.nsi repo.scm: wget https://snow-fort.org/s/repo.scm -- 2.40.1 From 6350bfb71726f42b8e6ca265c37554987bf572bd Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:18:15 +0300 Subject: [PATCH 14/28] Fixing the build --- Dockerfile.jenkins | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index fedc71c..145ac94 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -2,6 +2,7 @@ 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 mkdir -p /workdir && chomd -R 777 /workdir WORKDIR /workdir COPY ./executables/nsis-3.10-setup.exe /workdir/setup.exe RUN WINEPREFIX=/workdir/.wine wine setup.exe /S -- 2.40.1 From c8f9015d6b59495efee59b0d497c14521c2949b3 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:18:36 +0300 Subject: [PATCH 15/28] Fixing the build --- Dockerfile.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 145ac94..a85d741 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -2,7 +2,7 @@ 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 mkdir -p /workdir && chomd -R 777 /workdir +RUN mkdir -p /workdir && chmod -R 777 /workdir WORKDIR /workdir COPY ./executables/nsis-3.10-setup.exe /workdir/setup.exe RUN WINEPREFIX=/workdir/.wine wine setup.exe /S -- 2.40.1 From 44814b445a5306881a479fc135d4d5935012f65b Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:23:46 +0300 Subject: [PATCH 16/28] Fixing the build --- Dockerfile.jenkins | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index a85d741..a25cd78 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -2,8 +2,10 @@ 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 mkdir -p /workdir && chmod -R 777 /workdir +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 -- 2.40.1 From 7620ce4b7cdd1dfe2c9ab1bc0cac3a985826c229 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:28:14 +0300 Subject: [PATCH 17/28] Fixing the build --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 26dabc9..32bc9a3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ build: snow + whoami wine makensis.exe install.nsi repo.scm: -- 2.40.1 From b2ed34ff3381e9070b2cd3c86b00ea02581ee6e0 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:30:22 +0300 Subject: [PATCH 18/28] 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 -- 2.40.1 From 3cac735ac4cbbcaf289c6c04feac476694968bdf Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:31:22 +0300 Subject: [PATCH 19/28] Fixing the build --- Jenkinsfile | 3 ++- Makefile | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c50e7bc..5d01a54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,8 @@ pipeline { stages { stage("Build") { steps { - sh 'make install-nsis' + sh 'wine winecfg' + sh 'wine ./executables/nsis-3.10-setup.exe /S' sh 'make' archiveArtifacts artifacts: 'setup_*.exe' } diff --git a/Makefile b/Makefile index 5ef1f1c..6830389 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,6 @@ 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 -- 2.40.1 From 1cd0314efa1b9b641d3ba6d579cac9771b9bb632 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:32:00 +0300 Subject: [PATCH 20/28] Fixing the build --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5d01a54..9476ab4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,7 @@ pipeline { stages { stage("Build") { steps { + sh 'mkdir /.wine' sh 'wine winecfg' sh 'wine ./executables/nsis-3.10-setup.exe /S' sh 'make' -- 2.40.1 From 4af393b5e2ae97af8d9c18a7852e3e10a15af3c0 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:32:52 +0300 Subject: [PATCH 21/28] Fixing the build --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9476ab4..bbd273c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,9 +14,7 @@ pipeline { stages { stage("Build") { steps { - sh 'mkdir /.wine' - sh 'wine winecfg' - sh 'wine ./executables/nsis-3.10-setup.exe /S' + sh 'WINEPREFIX=${HOME}/.wine wine ./executables/nsis-3.10-setup.exe /S' sh 'make' archiveArtifacts artifacts: 'setup_*.exe' } -- 2.40.1 From e6ee43838f6ad181c7410b3e92042e62474f98c4 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:33:40 +0300 Subject: [PATCH 22/28] Fixing the build --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index bbd273c..a29345d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,7 @@ pipeline { stages { stage("Build") { steps { + sh 'whoami' sh 'WINEPREFIX=${HOME}/.wine wine ./executables/nsis-3.10-setup.exe /S' sh 'make' archiveArtifacts artifacts: 'setup_*.exe' -- 2.40.1 From b006160931b854db3ac0f3bf7ffc5ba6e496bdd7 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:35:42 +0300 Subject: [PATCH 23/28] Fixing the build --- Jenkinsfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a29345d..026775d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,7 @@ pipeline { agent { - dockerfile { - filename 'Dockerfile.jenkins' - dir '.' - } + label 'agent2' } options { @@ -13,6 +10,12 @@ pipeline { stages { stage("Build") { + agent { + dockerfile { + filename 'Dockerfile.jenkins' + dir '.' + } + } steps { sh 'whoami' sh 'WINEPREFIX=${HOME}/.wine wine ./executables/nsis-3.10-setup.exe /S' -- 2.40.1 From 5a11da9ea4c90f73a8c060dc25fdf784b27e8248 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:37:05 +0300 Subject: [PATCH 24/28] Fixing the build --- Dockerfile.jenkins | 1 + Jenkinsfile | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 2db1854..6dace57 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -2,3 +2,4 @@ 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 + diff --git a/Jenkinsfile b/Jenkinsfile index 026775d..a29345d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,10 @@ pipeline { agent { - label 'agent2' + dockerfile { + filename 'Dockerfile.jenkins' + dir '.' + } } options { @@ -10,12 +13,6 @@ pipeline { stages { stage("Build") { - agent { - dockerfile { - filename 'Dockerfile.jenkins' - dir '.' - } - } steps { sh 'whoami' sh 'WINEPREFIX=${HOME}/.wine wine ./executables/nsis-3.10-setup.exe /S' -- 2.40.1 From 2b31c0ebacb66f46bca012400eb43fac5bd432f9 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:38:05 +0300 Subject: [PATCH 25/28] Fixing the build --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a29345d..50d7a49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,6 +4,7 @@ pipeline { dockerfile { filename 'Dockerfile.jenkins' dir '.' + args '-u root --privileged' } } -- 2.40.1 From 86cd09c55d6f4c4c3ed94d9816d3fdce952e893d Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:39:11 +0300 Subject: [PATCH 26/28] Fixing the build --- Dockerfile.jenkins | 3 ++- Jenkinsfile | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 6dace57..b6a2bc5 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -2,4 +2,5 @@ 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 - +COPY ./executables/nsis-3.10-setup.exe /workdir/setup.exe +RUN wine setup.exe /S diff --git a/Jenkinsfile b/Jenkinsfile index 50d7a49..dd463a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,6 @@ pipeline { stage("Build") { steps { sh 'whoami' - sh 'WINEPREFIX=${HOME}/.wine wine ./executables/nsis-3.10-setup.exe /S' sh 'make' archiveArtifacts artifacts: 'setup_*.exe' } -- 2.40.1 From 2c8f4def35573bd8bab328a1df849567859e4ba1 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:39:53 +0300 Subject: [PATCH 27/28] Fixing the build --- Dockerfile.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index b6a2bc5..7291fd7 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -2,5 +2,5 @@ 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 -COPY ./executables/nsis-3.10-setup.exe /workdir/setup.exe +COPY ./executables/nsis-3.10-setup.exe /setup.exe RUN wine setup.exe /S -- 2.40.1 From b62b8af5e386febacedf8b39ba3c5505eae17463 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 12 Oct 2024 07:41:31 +0300 Subject: [PATCH 28/28] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a95ecb..5f17407 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ there might be more than one implementation. ## Installation Download the latest setup executable from -[Jenkins](https://jenkins.scheme.org/job/rinne/job/snow-fort-windows-installer/job/release) +[Jenkins](https://jenkins.scheme.org/job/rinne/job/snow-fort-windows-installer/job/main/) and run it. -- 2.40.1