merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
390 changed files with 13283 additions and 36177 deletions
Showing only changes of commit 8548dfca96 - Show all commits

View File

@@ -23,8 +23,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Run tests - name: Run tests
run: | run: |
docker build -f Dockerfile.${{ matrix.flavor }} -t profanity . docker build -f ci/Dockerfile.${{ matrix.flavor }} -t profanity .
docker run profanity ./ci-build.sh docker run profanity ./ci/ci-build.sh
linux-meson: linux-meson:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -40,8 +40,8 @@ jobs:
env: env:
OMEMO_BACKEND: libomemo-c OMEMO_BACKEND: libomemo-c
run: | run: |
docker build -f Dockerfile.${{ matrix.flavor }} -t profanity . docker build -f ci/Dockerfile.${{ matrix.flavor }} -t profanity .
docker run -e OMEMO_BACKEND profanity ./ci-meson-build.sh docker run -e OMEMO_BACKEND profanity ./ci/ci-meson-build.sh
code-style: code-style:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04

View File

@@ -48,7 +48,7 @@ meson setup build_run -Domemo=enabled -Domemo-backend=libomemo-c
3. Run: `./build_run/profanity` 3. Run: `./build_run/profanity`
We also have a [build section](https://profanity-im.github.io/guide/latest/build.html) in our user guide. We also have a [build section](https://profanity-im.github.io/guide/latest/build.html) in our user guide.
You might also take a look at the `Dockerfile.*` in the root directory. You might also take a look at the `Dockerfile.*` in the `ci` directory.
## Submitting patches ## Submitting patches
We recommend for people to always work on a dedicated git branch for each fix or feature. We recommend for people to always work on a dedicated git branch for each fix or feature.
@@ -180,7 +180,7 @@ snippet to `.git/hooks/pre-push`:
```shell ```shell
#!/bin/sh #!/bin/sh
set -e set -e
./ci-build.sh ./ci/ci-build.sh
``` ```
This will run the same tests that the CI runs and refuse the push if it fails. This will run the same tests that the CI runs and refuse the push if it fails.
@@ -202,7 +202,7 @@ In cases where you want to disable automatic formatting for a specific block of
## Verification & Testing ## Verification & Testing
### Running unit tests ### Running unit tests
Run `make check` to run the unit tests with your current configuration or `./ci-build.sh` to check with different switches passed to configure. Run `make check` to run the unit tests with your current configuration or `./ci/ci-build.sh` to check with different switches passed to configure.
### Writing unit tests ### Writing unit tests
We use the [cmocka](https://cmocka.org/) testing framework for unit tests. We use the [cmocka](https://cmocka.org/) testing framework for unit tests.