From 3c405aeaf65d62b0a68b905ac6e6ae652965a159 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Nov 2022 20:22:09 +0100 Subject: [PATCH 01/11] New release v1.11.13-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 4912004..3d6ff48 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6 +Subproject commit 3d6ff486d4a8cafd018aa697dd9e764e729baaac diff --git a/element-web b/element-web index 2abfc19..1f45edd 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c +Subproject commit 1f45edd3d08cf91e982e15c575d1c348956101b2 From b6fe9591539bcc47dc10f61e1717f225a8012a07 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Nov 2022 22:41:56 +0100 Subject: [PATCH 02/11] =?UTF-8?q?Meh,=20flathub=20seems=20to=20require=20P?= =?UTF-8?q?Rs=20now=20=F0=9F=90=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/update-flathub.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh index 31c4ce5..7451aec 100755 --- a/deploy/update-flathub.sh +++ b/deploy/update-flathub.sh @@ -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$| \n /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/" From 0bfa5733d5e50816c6d15a24392606b5f0d06e98 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 12 Nov 2022 11:28:31 +0100 Subject: [PATCH 03/11] New test release v1.11.14-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 3d6ff48..07d1283 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 3d6ff486d4a8cafd018aa697dd9e764e729baaac +Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00 diff --git a/element-web b/element-web index 1f45edd..d7e4930 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1f45edd3d08cf91e982e15c575d1c348956101b2 +Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b diff --git a/matrix-js-sdk b/matrix-js-sdk index 679ba69..1474204 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9 +Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676 diff --git a/matrix-react-sdk b/matrix-react-sdk index eb43745..c9fb6bb 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1 +Subproject commit c9fb6bbbb8bf97802277127601163618669acdee From 92ac040175759ff476bc6aada6874f485dd4a118 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Nov 2022 23:39:05 +0100 Subject: [PATCH 04/11] Renovate config.json - default_server_name --> default_server_config - Add more room directories --- configs/sc/config.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index 2916dee..4af6da3 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -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", @@ -14,7 +19,10 @@ "showLabsSettings": true, "roomDirectory": { "servers": [ - "matrix.org" + "matrix.org", + "gitter.im", + "libera.chat", + "schildi.chat" ] }, "enable_presence_by_hs_url": { From 51e7d4b67b71543370c88277007983e51f7a6154 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 26 Nov 2022 00:30:33 +0100 Subject: [PATCH 05/11] New test release v1.11.15-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 07d1283..dd74e36 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00 +Subproject commit dd74e3628176f0ad39097325e5603fec51408a83 diff --git a/element-web b/element-web index d7e4930..fcf043c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b +Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d diff --git a/matrix-js-sdk b/matrix-js-sdk index 1474204..6128de1 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676 +Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636 diff --git a/matrix-react-sdk b/matrix-react-sdk index c9fb6bb..0ad473a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit c9fb6bbbb8bf97802277127601163618669acdee +Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e From fc27cbfd7476e5b494349e288c6d04e7d5f881c1 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 4 Dec 2022 02:37:55 +0100 Subject: [PATCH 06/11] Allow building using containers Co-authored-by: Paarth Shah Closes #145 --- .containerignore | 1 + Containerfile.debian | 30 ++++++++++++++++++++++++++++++ Containerfile.fedora | 20 ++++++++++++++++++++ Makefile | 25 +++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 .containerignore create mode 100644 Containerfile.debian create mode 100644 Containerfile.fedora diff --git a/.containerignore b/.containerignore new file mode 100644 index 0000000..ae02570 --- /dev/null +++ b/.containerignore @@ -0,0 +1 @@ +release/ \ No newline at end of file diff --git a/Containerfile.debian b/Containerfile.debian new file mode 100644 index 0000000..041c64e --- /dev/null +++ b/Containerfile.debian @@ -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 \ No newline at end of file diff --git a/Containerfile.fedora b/Containerfile.fedora new file mode 100644 index 0000000..279d43f --- /dev/null +++ b/Containerfile.fedora @@ -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 \ No newline at end of file diff --git a/Makefile b/Makefile index 21c3bf4..c517e5b 100644 --- a/Makefile +++ b/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 From a4ab5f55c92db470926b80239e14a1a132ff4fec Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 4 Dec 2022 02:56:38 +0100 Subject: [PATCH 07/11] New test release v1.11.15-sc.0.test.2 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index dd74e36..d25e426 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dd74e3628176f0ad39097325e5603fec51408a83 +Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b diff --git a/element-web b/element-web index fcf043c..ebb0d6a 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d +Subproject commit ebb0d6a212299540247587abd345ce633a414813 diff --git a/matrix-react-sdk b/matrix-react-sdk index 0ad473a..23de404 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e +Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951 From eb17c2ad9459437d06d834307b4d5ff23051f80a Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 6 Dec 2022 20:08:30 +0100 Subject: [PATCH 08/11] New test release v1.11.16-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index d25e426..dfc6afa 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b +Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de diff --git a/element-web b/element-web index ebb0d6a..91850ae 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ebb0d6a212299540247587abd345ce633a414813 +Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55 diff --git a/matrix-js-sdk b/matrix-js-sdk index 6128de1..789e2bf 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636 +Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f diff --git a/matrix-react-sdk b/matrix-react-sdk index 23de404..2d34475 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951 +Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70 From 9d4602fea6068e42e02a0edfdb4efcd7407d0b57 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 23 Dec 2022 10:14:00 +0100 Subject: [PATCH 09/11] Add stale automation github action --- .github/workflows/stale.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..674a67d --- /dev/null +++ b/.github/workflows/stale.yml @@ -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' From 775fb00b75bb2c245ddbfedb6d0fd098f5ab8595 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 15 Jan 2023 12:31:07 +0100 Subject: [PATCH 10/11] Adjust default config.json to changed property names --- configs/sc/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index 4af6da3..0402a78 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -16,8 +16,8 @@ "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", "gitter.im", From 965a3b2d0e7df545105e084c82e26de0ff6ef03b Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 15 Jan 2023 12:33:34 +0100 Subject: [PATCH 11/11] New test release v1.11.17-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index dfc6afa..86f7509 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de +Subproject commit 86f7509f07039d94f43c3736518425eef0d43b3a diff --git a/element-web b/element-web index 91850ae..02ec7bb 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55 +Subproject commit 02ec7bb3b0ffa47aca0d59a92788ef55ef481e78 diff --git a/matrix-js-sdk b/matrix-js-sdk index 789e2bf..b9afe23 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f +Subproject commit b9afe2320caee4969dc64c09ba680f0041e3ca5a diff --git a/matrix-react-sdk b/matrix-react-sdk index 2d34475..7ebde05 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70 +Subproject commit 7ebde053f052965a463ab5b710110be33a2f4a1c