CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-18 15:34:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sonarcloud happier (#1810)

Browse Source
This commit is contained in:
Michael Telatynski 2024-07-31 15:08:06 +01:00 committed by GitHub
parent 6239aa5d9f
commit 13a0d0d3e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockerbuild/Dockerfile
View File

@ -4,8 +4,8 @@ FROM rust:buster
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN curl --proto "=https" -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv yarn-* /yarn && ln -s /yarn/bin/yarn /usr/bin/yarn RUN curl --proto "=https" -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv yarn-* /yarn && ln -s /yarn/bin/yarn /usr/bin/yarn
RUN apt-get -qq update && apt-get -qq dist-upgrade && \ RUN apt-get -qq update && apt-get -y -qq dist-upgrade && \
apt-get -qq install --no-install-recommends \ apt-get -y -qq install --no-install-recommends \
# tclsh is required for building SQLite as part of SQLCipher # tclsh is required for building SQLite as part of SQLCipher
tcl \ tcl \
# libsecret-1-dev is required even for prebuild keytar # libsecret-1-dev is required even for prebuild keytar

2
playwright/Dockerfile
View File

@ -2,7 +2,7 @@ FROM mcr.microsoft.com/playwright:v1.45.3-jammy
WORKDIR /work/element-desktop WORKDIR /work/element-desktop
RUN apt-get update && apt-get -y install xvfb RUN apt-get update && apt-get -y install xvfb && apt-get purge -y --auto-remove && rm -rf /var/lib/apt/lists/*
USER 1000:1000 USER 1000:1000

7
scripts/hak/hakEnv.ts
View File

@ -97,15 +97,16 @@ export default class HakEnv {
} }
public makeGypEnv(): Record<string, string | undefined> { public makeGypEnv(): Record<string, string | undefined> {
return Object.assign({}, process.env, { return {
...process.env,
npm_config_arch: this.target.arch, npm_config_arch: this.target.arch,
npm_config_target_arch: this.target.arch, npm_config_target_arch: this.target.arch,
npm_config_disturl: "https://electronjs.org/headers", npm_config_disturl: "https://electronjs.org/headers",
npm_config_runtime: this.runtime, npm_config_runtime: this.runtime,
npm_config_target: this.runtimeVersion, npm_config_target: this.runtimeVersion,
npm_config_build_from_source: true, npm_config_build_from_source: "true",
npm_config_devdir: path.join(os.homedir(), ".electron-gyp"), npm_config_devdir: path.join(os.homedir(), ".electron-gyp"),
}); };
} }
public wantsStaticSqlCipher(): boolean { public wantsStaticSqlCipher(): boolean {

2
src/updater.ts
View File

@ -79,7 +79,7 @@ async function pollForUpdates(): Promise<void> {
export async function start(updateBaseUrl: string): Promise<void> { export async function start(updateBaseUrl: string): Promise<void> {
if (!(await available(updateBaseUrl))) return; if (!(await available(updateBaseUrl))) return;
if (updateBaseUrl.slice(-1) !== "/") { if (!updateBaseUrl.endsWith("/")) {
updateBaseUrl = updateBaseUrl + "/"; updateBaseUrl = updateBaseUrl + "/";
} }