Compare commits

...

21 Commits

Author SHA1 Message Date
788816299c New release v1.11.26-sc.1 2023-03-28 20:59:25 +02:00
2e3d370c38 New test release v1.11.25-sc.0.test.1 2023-03-16 00:10:51 +01:00
d977e5c753 New test release v1.11.24-sc.0.test.1 2023-03-15 21:43:57 +01:00
0ef609f57b Translated using Weblate (Portuguese (Brazil))
Currently translated at 82.3% (42 of 51 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/pt_BR/
2023-03-03 19:00:13 +00:00
2066ef2623 New test release v1.11.23-sc.0.test.1 2023-03-01 00:21:34 +01:00
b0177a4276 Translated using Weblate (Czech)
Currently translated at 100.0% (51 of 51 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/cs/
2023-02-04 06:42:18 +00:00
87e7893d07 New release v1.11.22-sc.1 2023-02-01 20:32:07 +01:00
ae4eb4c3da New test release v1.11.22-sc.0.test.1 2023-02-01 16:51:20 +01:00
32f58e1c3f New test release v1.11.20-sc.0.test.1 2023-01-30 23:43:21 +01:00
db908634ea New test release v1.11.19-sc.0.test.1 2023-01-19 18:22:08 +01:00
965a3b2d0e New test release v1.11.17-sc.0.test.1 2023-01-15 13:18:24 +01:00
775fb00b75 Adjust default config.json to changed property names 2023-01-15 12:31:07 +01:00
9d4602fea6 Add stale automation github action 2022-12-23 10:14:00 +01:00
eb17c2ad94 New test release v1.11.16-sc.0.test.1 2022-12-06 20:08:30 +01:00
a4ab5f55c9 New test release v1.11.15-sc.0.test.2 2022-12-04 02:56:38 +01:00
fc27cbfd74 Allow building using containers
Co-authored-by: Paarth Shah <mail@shahpaarth.com>

Closes #145
2022-12-04 02:37:55 +01:00
51e7d4b67b New test release v1.11.15-sc.0.test.1 2022-11-26 00:30:33 +01:00
92ac040175 Renovate config.json
- default_server_name --> default_server_config
- Add more room directories
2022-11-15 23:39:05 +01:00
0bfa5733d5 New test release v1.11.14-sc.0.test.1 2022-11-12 11:28:31 +01:00
b6fe959153 Meh, flathub seems to require PRs now 🐐 2022-11-05 22:42:14 +01:00
3c405aeaf6 New release v1.11.13-sc.1 2022-11-05 20:22:09 +01:00
13 changed files with 118 additions and 13 deletions

1
.containerignore Normal file
View File

@ -0,0 +1 @@
release/

17
.github/workflows/stale.yml vendored Normal file
View 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
View 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
View 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

View File

@ -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

View File

@ -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": {

View File

@ -20,8 +20,11 @@ debdate=$(date +%Y-%m-%d -r $debpath)
pushd "$repopath" > /dev/null
git fetch
git checkout master
git reset --hard origin/master
git checkout -B "release-v$version"
yamlFile="chat.schildi.desktop.yaml"
xmlFile="chat.schildi.desktop.metainfo.xml"
@ -33,8 +36,8 @@ sed -i "s|^\s\s<releases>$| <releases>\n <release version=\"$version\" date=
git add $yamlFile $xmlFile
git commit -m "Bump version to v$version"
git push
git push -f --set-upstream origin "release-v$version"
popd > /dev/null
echo "Release v$version published on flathub!"
echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"

View File

@ -21,8 +21,8 @@
"MXID": "MXID",
"In group chats": "Ve skupinových chatech",
"In public rooms": "Ve veřejných místnostech",
"All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v domovském zobrazení.",
"Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení",
"All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v Úvodu.",
"Show all rooms in Home": "Zobrazit všechny místnosti v Úvodu",
"Show people in spaces": "Ukázat lidi v prostorech",
"Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé v prostorech",
"Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru",

View File

@ -40,5 +40,6 @@
"Room list style": "Estilo da lista de salas",
"Mark rooms as unread": "Permitir markar conversas como não lidos",
"Mark as unread": "Markar como não lido",
"Mark as read": "Markar como lido"
"Mark as read": "Markar como lido",
"Collapse additional buttons": "Recolher botões adicionais"
}