diff --git a/.containerignore b/.containerignore deleted file mode 100644 index ae02570..0000000 --- a/.containerignore +++ /dev/null @@ -1 +0,0 @@ -release/ \ No newline at end of file diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index 674a67d..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,17 +0,0 @@ -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' diff --git a/Containerfile.debian b/Containerfile.debian deleted file mode 100644 index 041c64e..0000000 --- a/Containerfile.debian +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 279d43f..0000000 --- a/Containerfile.fedora +++ /dev/null @@ -1,20 +0,0 @@ -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 c517e5b..21c3bf4 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ .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 @@ -10,8 +8,6 @@ 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|') @@ -36,9 +32,6 @@ 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) @@ -160,24 +153,6 @@ 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 diff --git a/configs/sc/config.json b/configs/sc/config.json index 0402a78..2916dee 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -1,11 +1,6 @@ { "update_base_url": null, - "default_server_config": { - "m.homeserver": { - "base_url": "https://matrix-client.matrix.org", - "server_name": "matrix.org" - } - }, + "default_server_name": "matrix.org", "brand": "SchildiChat", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", @@ -16,13 +11,10 @@ "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api" ], - "show_labs_settings": true, - "room_directory": { + "showLabsSettings": true, + "roomDirectory": { "servers": [ - "matrix.org", - "gitter.im", - "libera.chat", - "schildi.chat" + "matrix.org" ] }, "enable_presence_by_hs_url": { diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh index 7451aec..31c4ce5 100755 --- a/deploy/update-flathub.sh +++ b/deploy/update-flathub.sh @@ -20,11 +20,8 @@ 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" @@ -36,8 +33,8 @@ sed -i "s|^\s\s$| \n /dev/null -echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/" +echo "Release v$version published on flathub!" diff --git a/element-desktop b/element-desktop index 6e19b2e..4912004 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 6e19b2eae6fa3e362d25166655c419f90d70f2db +Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6 diff --git a/element-web b/element-web index 172df12..2abfc19 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 172df12d60ea12d00cec7c2e0dbc4607356e4a4e +Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c diff --git a/matrix-js-sdk b/matrix-js-sdk index e6c127a..679ba69 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit e6c127a392ec5165ce348b84ff1290efbef0f1cb +Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9 diff --git a/matrix-react-sdk b/matrix-react-sdk index bba6767..eb43745 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit bba676718ad4f5de627909036804f5b050af71f7 +Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1