forked from github/schildichat-desktop
Compare commits
7 commits
v1.11.29-s
...
v1.11.29-s
Author | SHA1 | Date | |
---|---|---|---|
![]() |
1a485faf72 | ||
![]() |
64557e1da9 | ||
![]() |
5122f0e870 | ||
![]() |
0eb99a6a60 | ||
![]() |
979be00158 | ||
![]() |
10a5112285 | ||
![]() |
40c598e91b |
7 changed files with 27 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
|||
FROM fedora:latest
|
||||
|
||||
RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
|
||||
RUN dnf install -y openssl openssl-devel rust cargo llvm15 libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
|
||||
|
||||
# node setup
|
||||
ARG NODE_VERSION
|
||||
|
@ -11,7 +11,7 @@ RUN bash n ${NODE_VERSION}
|
|||
RUN npm install -g n
|
||||
RUN npm install -g yarn
|
||||
RUN npm install -g node-gyp
|
||||
RUN gem install --ignore-dependencies --no-user-install --no-document fpm
|
||||
RUN gem install --no-user-install --no-document fpm
|
||||
|
||||
COPY . /project
|
||||
WORKDIR /project
|
||||
|
|
6
Makefile
6
Makefile
|
@ -4,6 +4,7 @@
|
|||
.PHONY: container-build-debian container-build-fedora
|
||||
.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
|
||||
.PHONY: clean undo_setup fixup
|
||||
.PHONY: fix_yarn_cache
|
||||
|
||||
CFGDIR ?= configs/sc
|
||||
|
||||
|
@ -182,6 +183,9 @@ bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.loc
|
|||
./build-bom.sh
|
||||
bom: bom.lock
|
||||
|
||||
fix_yarn_cache:
|
||||
$(YARN) cache list || $(YARN) cache clean
|
||||
|
||||
clean:
|
||||
$(YARN) --cwd matrix-js-sdk clean
|
||||
$(YARN) --cwd matrix-react-sdk clean
|
||||
|
@ -195,7 +199,7 @@ clean:
|
|||
undo_setup:
|
||||
rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
|
||||
|
||||
fixup: undo_setup
|
||||
fixup: undo_setup fix_yarn_cache
|
||||
make setup
|
||||
make clean
|
||||
make setup
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 46a18d2dfd420cc1f654fbb218ed97d64a22b8f4
|
||||
Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca
|
|
@ -1 +1 @@
|
|||
Subproject commit a21fcb8fbf4bf1026c0cbcc813af9ea618e62743
|
||||
Subproject commit d8643e4983b11a87831af1729037976d14641454
|
15
hard_reset_repos.sh
Executable file
15
hard_reset_repos.sh
Executable file
|
@ -0,0 +1,15 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
|
||||
cd "$mydir"
|
||||
|
||||
source ./merge_helpers.sh
|
||||
|
||||
# Note: this doesn't delete files starting with a dot,
|
||||
# and in particular not the '.git' directory, which we
|
||||
# want to keep
|
||||
forall_repos bash -c 'rm -rf *'
|
||||
forall_repos git reset HEAD --hard
|
|
@ -49,5 +49,6 @@
|
|||
"Mixed": "Mixed",
|
||||
"Sound pack": "Sound pack",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety",
|
||||
"Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element"
|
||||
"Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element",
|
||||
"React with \"%(reaction)s\"": "React with \"%(reaction)s\""
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 1d04bb0f28a0581a6ea93aa21cdac25843c9bb4d
|
||||
Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341
|
Loading…
Add table
Add a link
Reference in a new issue