Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
77475b6dee
WIP: signing 2023-11-16 20:06:51 +01:00
3 changed files with 35 additions and 12 deletions

View file

@ -4,6 +4,7 @@ FROM dtmt-ci-base-linux
ENV KEYRINGS /usr/local/share/keyrings ENV KEYRINGS /usr/local/share/keyrings
ARG XWIN_VERSION=0.2.11 ARG XWIN_VERSION=0.2.11
ARG XWIN_PREFIX="xwin-$XWIN_VERSION-x86_64-unknown-linux-musl" ARG XWIN_PREFIX="xwin-$XWIN_VERSION-x86_64-unknown-linux-musl"
ARG OSSLSIGNCODE_VERSION=2.7
ADD https://apt.llvm.org/llvm-snapshot.gpg.key /root/llvm-snapshot.gpg.key ADD https://apt.llvm.org/llvm-snapshot.gpg.key /root/llvm-snapshot.gpg.key
ADD https://dl.winehq.org/wine-builds/winehq.key /root/winehq.key ADD https://dl.winehq.org/wine-builds/winehq.key /root/winehq.key
@ -20,13 +21,19 @@ RUN set -eux; \
dpkg --add-architecture i386; \ dpkg --add-architecture i386; \
apt-get update; \ apt-get update; \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
libclang-13-dev \ cmake \
gcc-mingw-w64-x86-64 \ libssl-dev \
clang-13 \ libcurl4-openssl-dev \
llvm-13 \ zlib1g-dev \
lld-13 \ python3 \
winehq-staging \ libclang-13-dev \
tar; \ gcc-mingw-w64-x86-64 \
clang-13 \
llvm-13 \
lld-13 \
winehq-staging \
tar \
; \
# ensure that clang/clang++ are callable directly # ensure that clang/clang++ are callable directly
ln -s clang-13 /usr/bin/clang && ln -s clang /usr/bin/clang++ && ln -s lld-13 /usr/bin/ld.lld; \ ln -s clang-13 /usr/bin/clang && ln -s clang /usr/bin/clang++ && ln -s lld-13 /usr/bin/ld.lld; \
# We also need to setup symlinks ourselves for the MSVC shims because they aren't in the debian packages # We also need to setup symlinks ourselves for the MSVC shims because they aren't in the debian packages
@ -51,11 +58,24 @@ RUN set -eux; \
# Remove unneeded files to reduce image size # Remove unneeded files to reduce image size
apt-get remove -y --auto-remove; \ apt-get remove -y --auto-remove; \
rm -rf \ rm -rf \
.xwin-cache \ .xwin-cache \
/usr/local/cargo/bin/xwin \ /usr/local/cargo/bin/xwin \
/root/$XWIN_PREFIX.tar.gz \ /root/$XWIN_PREFIX.tar.gz \
/var/lib/apt/lists/* \ /var/lib/apt/lists/* \
/root/*.key; /root/*.key;
ADD https://github.com/mtrojnar/osslsigncode/archive/refs/tags/${OSSLSIGNCODE_VERSION}.tar.gz /root/osslsigncode.tar.gz
RUN set -ex; \
tar -xzv -f /root/osslsigncode.tar.gz;\
cd osslsigncode-${OSSLSIGNCODE_VERSION}; \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release; \
cmake --build build; \
cmake --install build; \
cd ../; \
rm -rf \
/root/osslsigncode.tar.gz \
osslsigncode-${OSSLSIGNCODE_VERSION};
# Note that we're using the full target triple for each variable instead of the # Note that we're using the full target triple for each variable instead of the
# simple CC/CXX/AR shorthands to avoid issues when compiling any C/C++ code for # simple CC/CXX/AR shorthands to avoid issues when compiling any C/C++ code for

3
.gitignore vendored
View file

@ -6,3 +6,6 @@
*.dll *.dll
*.lib *.lib
dictionary.csv dictionary.csv
signing/*
!signing/.gitkeep

0
signing/.gitkeep Normal file
View file