Compare commits

..

7 Commits

Author SHA1 Message Date
1a485faf72 New test release v1.11.29-sc.0.test.3 2023-04-22 12:30:03 +02:00
64557e1da9 New test release v1.11.29-sc.0.test.2 2023-04-22 12:25:57 +02:00
5122f0e870 Add missing string for freeform reactions 2023-04-22 12:25:57 +02:00
0eb99a6a60 Make fixup: also check if yarn cache is broken and clean it if necessary
If `yarn cache list` fails, this can also lead to weird errors during
fixup, like
```
error /schildichat-desktop/matrix-react-sdk/node_modules/cypress: Command failed.
Exit code: 1
Command: node index.js --exec install
Arguments:
Directory: /schildichat-desktop/matrix-react-sdk/node_modules/cypress
Output:
node:internal/modules/cjs/loader:433
      throw err;
      ^

Error: Cannot find module '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals/build/src/main.js'. Please verify that the package.json has a valid "main" entry
    at tryPackage (node:internal/modules/cjs/loader:425:19)
    at Function.Module._findPath (node:internal/modules/cjs/loader:638:18)
    at Function.Module._resolveFilename (node:internal/modules/cjs/loader:1012:27)
    at Function.Module._load (node:internal/modules/cjs/loader:871:27)
    at Module.require (node:internal/modules/cjs/loader:1098:19)
    at require (node:internal/modules/cjs/helpers:108:18)
    at Object.<anonymous> (/schildichat-desktop/matrix-react-sdk/node_modules/execa/lib/error.js:2:25)
    at Module._compile (node:internal/modules/cjs/loader:1196:14)
    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1250:10)
    at Module.load (node:internal/modules/cjs/loader:1074:32) {
  code: 'MODULE_NOT_FOUND',
  path: '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals
```
2023-04-22 10:41:59 +02:00
979be00158 Add script to completely reset repos from leftovers 2023-04-22 10:41:59 +02:00
10a5112285 ruby fpm also needs its dependencies for Fedora 2023-04-21 12:47:41 +02:00
40c598e91b llvm15 seems to be necessary for Fedora 38 with rust 2023-04-21 12:37:58 +02:00
7 changed files with 27 additions and 7 deletions

View File

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

View File

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

15
hard_reset_repos.sh Executable file
View 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

View File

@ -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\""
}