mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-06-15 23:11:54 +02:00
Compare commits
10 Commits
v1.11.14-s
...
v1.11.20-s
Author | SHA1 | Date | |
---|---|---|---|
32f58e1c3f | |||
db908634ea | |||
965a3b2d0e | |||
775fb00b75 | |||
9d4602fea6 | |||
eb17c2ad94 | |||
a4ab5f55c9 | |||
fc27cbfd74 | |||
51e7d4b67b | |||
92ac040175 |
1
.containerignore
Normal file
1
.containerignore
Normal file
@ -0,0 +1 @@
|
||||
release/
|
17
.github/workflows/stale.yml
vendored
Normal file
17
.github/workflows/stale.yml
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
name: 'Close stale issues'
|
||||
on:
|
||||
schedule:
|
||||
- cron: '30 1 * * *'
|
||||
|
||||
jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/stale@v6
|
||||
with:
|
||||
stale-issue-message: 'This issue is stale because it has been open 150 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
|
||||
days-before-issue-stale: 150
|
||||
days-before-issue-close: 14
|
||||
days-before-pr-stale: -1
|
||||
days-before-pr-close: -1
|
||||
exempt-issue-labels: 'longterm,enhancement,parity-with-android,prio:medium,prio:high,electron issue,encrypted room search,build infrastructure'
|
30
Containerfile.debian
Normal file
30
Containerfile.debian
Normal file
@ -0,0 +1,30 @@
|
||||
ARG NODE_VERSION
|
||||
FROM node:${NODE_VERSION}
|
||||
|
||||
RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
|
||||
curl \
|
||||
g++ \
|
||||
gcc \
|
||||
git \
|
||||
jq \
|
||||
libarchive-tools \
|
||||
libsecret-1-dev \
|
||||
libsqlcipher-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
openssl \
|
||||
pkg-config \
|
||||
python \
|
||||
tcl \
|
||||
vim
|
||||
|
||||
ENV RUSTUP_HOME=/usr/local/rustup \
|
||||
CARGO_HOME=/usr/local/cargo \
|
||||
PATH=/usr/local/cargo/bin:$PATH
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal
|
||||
|
||||
COPY . /project
|
||||
WORKDIR /project
|
||||
|
||||
# There might be remnants of the host which break the build
|
||||
RUN make fixup
|
20
Containerfile.fedora
Normal file
20
Containerfile.fedora
Normal file
@ -0,0 +1,20 @@
|
||||
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
|
||||
|
||||
# node setup
|
||||
ARG NODE_VERSION
|
||||
RUN mkdir -p /usr/local/n
|
||||
RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share
|
||||
RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
|
||||
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
|
||||
|
||||
COPY . /project
|
||||
WORKDIR /project
|
||||
|
||||
# There might be remnants of the host which break the build
|
||||
RUN make fixup
|
25
Makefile
25
Makefile
@ -1,6 +1,8 @@
|
||||
.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
|
||||
.PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
|
||||
.PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
|
||||
.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
|
||||
|
||||
CFGDIR ?= configs/sc
|
||||
@ -8,6 +10,8 @@ CFGDIR ?= configs/sc
|
||||
all: web
|
||||
|
||||
YARN ?= yarnpkg
|
||||
CONTAINER_ENGINE ?= podman
|
||||
NODE_VERSION ?= 16
|
||||
|
||||
VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
@ -32,6 +36,9 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
|
||||
OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
|
||||
OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
|
||||
|
||||
CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
|
||||
CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
|
||||
|
||||
RELEASE_DIR := release
|
||||
CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
|
||||
|
||||
@ -153,6 +160,24 @@ macos-mas-release: macos-mas
|
||||
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||
cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
|
||||
|
||||
container-build-debian:
|
||||
$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
|
||||
|
||||
container-build-fedora:
|
||||
$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
|
||||
|
||||
container-web-release: container-build-debian
|
||||
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
|
||||
|
||||
container-debian-release: container-build-debian
|
||||
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
|
||||
|
||||
container-rpm-release: container-build-fedora
|
||||
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
|
||||
|
||||
container-appimage-release: container-build-debian
|
||||
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
|
||||
|
||||
bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
|
||||
./build-bom.sh
|
||||
bom: bom.lock
|
||||
|
@ -1,6 +1,11 @@
|
||||
{
|
||||
"update_base_url": null,
|
||||
"default_server_name": "matrix.org",
|
||||
"default_server_config": {
|
||||
"m.homeserver": {
|
||||
"base_url": "https://matrix-client.matrix.org",
|
||||
"server_name": "matrix.org"
|
||||
}
|
||||
},
|
||||
"brand": "SchildiChat",
|
||||
"integrations_ui_url": "https://scalar.vector.im/",
|
||||
"integrations_rest_url": "https://scalar.vector.im/api",
|
||||
@ -11,10 +16,13 @@
|
||||
"https://scalar-staging.vector.im/api",
|
||||
"https://scalar-staging.riot.im/scalar/api"
|
||||
],
|
||||
"showLabsSettings": true,
|
||||
"roomDirectory": {
|
||||
"show_labs_settings": true,
|
||||
"room_directory": {
|
||||
"servers": [
|
||||
"matrix.org"
|
||||
"matrix.org",
|
||||
"gitter.im",
|
||||
"libera.chat",
|
||||
"schildi.chat"
|
||||
]
|
||||
},
|
||||
"enable_presence_by_hs_url": {
|
||||
|
Submodule element-desktop updated: 07d1283f23...8f68fc6612
Submodule element-web updated: d7e4930ab4...62767baf0e
Submodule matrix-js-sdk updated: 14742043de...d89e210512
Submodule matrix-react-sdk updated: c9fb6bbbb8...dd020a8866
Reference in New Issue
Block a user