diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..02a430a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM jenkins/inbound-agent:latest + +USER root + +RUN apt-get update && apt-get install -y build-essential cmake pkg-config mingw-w64 xz-utils wget \ + libx11-dev libxrender-dev libfreetype-dev libwayland-dev wayland-protocols libxkbcommon-dev libcairo-dev libdbus-1-dev libgl-dev libvulkan-dev + +RUN mkdir -p /usr/watcom && wget -q -O /tmp/ow-snapshot.tar.xz https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build/ow-snapshot.tar.xz +RUN tar xJf /tmp/ow-snapshot.tar.xz -C /usr/watcom && rm -f /tmp/ow-snapshot.tar.xz + +ENV PATH=/usr/watcom/binl64:$PATH +ENV WATCOM=/usr/watcom +ENV INCLUDE=/usr/watcom/h + +USER jenkins diff --git a/Jenkinsfile b/Jenkinsfile index 40cd979..4e17a07 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,8 +29,6 @@ pipeline { label "untrusted" } steps { - sh("apt-get update") - sh("apt-get install -y build-essential libx11-dev wayland-protocols libwayland-dev") sh("git clean -dfx") sh("./configure --enable-opengl --enable-vulkan --without-vulkan-string-helper") sh("make -j4") @@ -43,8 +41,6 @@ pipeline { label "untrusted" } steps { - sh("apt-get update") - sh("apt-get install -y make mingw-w64") sh("git clean -dfx") sh("./configure --enable-opengl --cross --target=Windows --host=i686-w64-mingw32") sh("make -j4") @@ -58,8 +54,6 @@ pipeline { label "untrusted" } steps { - sh("apt-get update") - sh("apt-get install -y make mingw-w64") sh("git clean -dfx") sh("./configure --enable-opengl --cross --target=Windows --host=x86_64-w64-mingw32") sh("make -j4") @@ -84,18 +78,7 @@ pipeline { agent { label "untrusted" } - environment { - WATCOM = "/usr/watcom" - INCLUDE = "/usr/watcom/h:/usr/watcom/h/nt" - PATH = "/usr/watcom/binl64:${env.PATH}" - } steps { - sh("apt-get update") - sh("apt-get install -y wget") - sh("git clean -dfx") - sh("wget https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build/ow-snapshot.tar.xz") - sh("mkdir -p /usr/watcom") - sh("tar xvf ow-snapshot.tar.xz -C /usr/watcom") sh("git clean -dfx") sh("wmake -f WatMakefile") sh("mv src/Mw.dll MwWat32.dll")