Skip to content

Commit a562d44

Browse files
JohnMcLearJohnMcLear
committed
Merge branch 'develop'
2 parents 4b96ff6 + 70f6c8b commit a562d44

File tree

195 files changed

+11869
-6207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+11869
-6207
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Dockerfile
1919
.git/ORIG_HEAD
2020
.git/packed-refs
2121
.git/refs/remotes/
22+
.git/rr-cache/
2223
.gitignore
2324

2425
settings.json

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
IMPORTANT: Please disable plugins prior to posting a bug report. If you have a problem with a plugin please post on the plugin repository. Thanks!
2-
31
---
42
name: Bug report
53
about: Create a report to help us improve
@@ -9,6 +7,8 @@ assignees: ''
97

108
---
119

10+
<!-- IMPORTANT: Please disable plugins prior to posting a bug report. If you have a problem with a plugin please post on the plugin repository. Thanks! -->
11+
1212
**Describe the bug**
1313
A clear and concise description of what the bug is.
1414

‎.github/dependabot.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
version: 2
2+
updates:
3+
# Maintain dependencies for GitHub Actions
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "daily"
8+
- package-ecosystem: "docker"
9+
directory: "/"
10+
schedule:
11+
interval: "daily"
12+
- package-ecosystem: "npm"
13+
directory: "/src"
14+
schedule:
15+
interval: "daily"
16+
versioning-strategy: "increase"
17+
- package-ecosystem: "npm"
18+
directory: "/src/bin/doc"
19+
schedule:
20+
interval: "daily"
21+
versioning-strategy: "increase"

‎.github/stale.yml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.github/workflows/backend-tests.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: "Backend tests"
33
# any branch is useful for testing before a PR is submitted
44
on: [push, pull_request]
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
withoutpluginsLinux:
811
# run on pushes to any branch
@@ -15,11 +18,11 @@ jobs:
1518
strategy:
1619
fail-fast: false
1720
matrix:
18-
node: [12, 14, 16]
21+
node: [14, 16, 18]
1922
steps:
2023
-
2124
name: Checkout repository
22-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3
2326
-
2427
uses: actions/setup-node@v3
2528
with:
@@ -52,11 +55,11 @@ jobs:
5255
strategy:
5356
fail-fast: false
5457
matrix:
55-
node: [12, 14, 16]
58+
node: [14, 16, 18]
5659
steps:
5760
-
5861
name: Checkout repository
59-
uses: actions/checkout@v2
62+
uses: actions/checkout@v3
6063
-
6164
uses: actions/setup-node@v3
6265
with:
@@ -117,11 +120,11 @@ jobs:
117120
steps:
118121
-
119122
name: Checkout repository
120-
uses: actions/checkout@v2
123+
uses: actions/checkout@v3
121124
-
122125
uses: actions/setup-node@v3
123126
with:
124-
node-version: 12
127+
node-version: 14
125128
cache: 'npm'
126129
cache-dependency-path: |
127130
src/package-lock.json
@@ -150,11 +153,11 @@ jobs:
150153
steps:
151154
-
152155
name: Checkout repository
153-
uses: actions/checkout@v2
156+
uses: actions/checkout@v3
154157
-
155158
uses: actions/setup-node@v3
156159
with:
157-
node-version: 12
160+
node-version: 14
158161
cache: 'npm'
159162
cache-dependency-path: |
160163
src/package-lock.json

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,21 @@ on:
99
schedule:
1010
- cron: '0 13 * * 1'
1111

12+
permissions:
13+
contents: read
14+
1215
jobs:
1316
analyze:
17+
permissions:
18+
actions: read # for github/codeql-action/init to get workflow details
19+
contents: read # for actions/checkout to fetch code
20+
security-events: write # for github/codeql-action/autobuild to send a status report
1421
name: Analyze
1522
runs-on: ubuntu-latest
1623
steps:
1724
-
1825
name: Checkout repository
19-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2027
with:
2128
# We must fetch at least the immediate parents so that if this is
2229
# a pull request then we can checkout the head.
@@ -28,10 +35,10 @@ jobs:
2835
if: ${{ github.event_name == 'pull_request' }}
2936
-
3037
name: Initialize CodeQL
31-
uses: github/codeql-action/init@v1
38+
uses: github/codeql-action/init@v2
3239
-
3340
name: Autobuild
34-
uses: github/codeql-action/autobuild@v1
41+
uses: github/codeql-action/autobuild@v2
3542
-
3643
name: Perform CodeQL Analysis
37-
uses: github/codeql-action/analyze@v1
44+
uses: github/codeql-action/analyze@v2

‎.github/workflows/dependency-review.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Dependency Review Action
2+
#
3+
# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
4+
#
5+
# Source repository: https://github.com/actions/dependency-review-action
6+
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
7+
name: 'Dependency Review'
8+
on: [pull_request]
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
dependency-review:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: 'Checkout Repository'
18+
uses: actions/checkout@v3
19+
- name: 'Dependency Review'
20+
uses: actions/dependency-review-action@v1

‎.github/workflows/docker.yml‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,26 @@ on:
88
- 'v?[0-9]+.[0-9]+.[0-9]+'
99
env:
1010
TEST_TAG: etherpad/etherpad:test
11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
docker:
1316
runs-on: ubuntu-latest
1417
steps:
1518
-
1619
name: Check out
17-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
21+
-
22+
name: Set up QEMU
23+
if: github.event_name == 'push'
24+
uses: docker/setup-qemu-action@v2
1825
-
1926
name: Set up Docker Buildx
20-
uses: docker/setup-buildx-action@v1
27+
uses: docker/setup-buildx-action@v2
2128
-
2229
name: Build and export to Docker
23-
uses: docker/build-push-action@v2
30+
uses: docker/build-push-action@v4
2431
with:
2532
context: .
2633
load: true
@@ -39,16 +46,25 @@ jobs:
3946
-
4047
name: Test
4148
run: |
42-
docker run --rm -d -p 9001:9001 ${{ env.TEST_TAG }}
49+
docker run --rm -d -p 9001:9001 --name test ${{ env.TEST_TAG }}
50+
docker logs -f test &
4351
./src/bin/installDeps.sh
44-
sleep 3
52+
while true; do
53+
echo "Waiting for Docker container to start..."
54+
status=$(docker container inspect -f '{{.State.Health.Status}}' test) || exit 1
55+
case ${status} in
56+
healthy) break;;
57+
starting) sleep 2;;
58+
*) printf %s\\n "unexpected status: ${status}" >&2; exit 1;;
59+
esac
60+
done
4561
(cd src && npm run test-container)
4662
git clean -dxf .
4763
-
4864
name: Docker meta
4965
if: github.event_name == 'push'
5066
id: meta
51-
uses: docker/metadata-action@v3
67+
uses: docker/metadata-action@v4
5268
with:
5369
images: etherpad/etherpad
5470
tags: |
@@ -59,16 +75,17 @@ jobs:
5975
-
6076
name: Log in to Docker Hub
6177
if: github.event_name == 'push'
62-
uses: docker/login-action@v1
78+
uses: docker/login-action@v2
6379
with:
6480
username: ${{ secrets.DOCKERHUB_USERNAME }}
6581
password: ${{ secrets.DOCKERHUB_TOKEN }}
6682
-
6783
name: Build and push
6884
if: github.event_name == 'push'
69-
uses: docker/build-push-action@v2
85+
uses: docker/build-push-action@v4
7086
with:
7187
context: .
88+
platforms: linux/amd64,linux/arm64
7289
push: true
7390
tags: ${{ steps.meta.outputs.tags }}
7491
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/frontend-admin-tests.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: "Frontend admin tests powered by Sauce Labs"
33

44
on: [push]
55

6+
permissions:
7+
contents: read # to fetch code (actions/checkout)
8+
69
jobs:
710
withplugins:
811
name: with plugins
@@ -11,7 +14,7 @@ jobs:
1114
strategy:
1215
fail-fast: false
1316
matrix:
14-
node: [12, 14, 16]
17+
node: [14, 16, 18]
1518

1619
steps:
1720
-
@@ -33,7 +36,7 @@ jobs:
3336
printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}-node${{ matrix.node }}'
3437
-
3538
name: Checkout repository
36-
uses: actions/checkout@v2
39+
uses: actions/checkout@v3
3740
-
3841
uses: actions/setup-node@v3
3942
with:

‎.github/workflows/frontend-tests.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: "Frontend tests powered by Sauce Labs"
33

44
on: [push]
55

6+
permissions:
7+
contents: read # to fetch code (actions/checkout)
8+
69
jobs:
710
withoutplugins:
811
name: without plugins
@@ -27,11 +30,11 @@ jobs:
2730
printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
2831
-
2932
name: Checkout repository
30-
uses: actions/checkout@v2
33+
uses: actions/checkout@v3
3134
-
3235
uses: actions/setup-node@v3
3336
with:
34-
node-version: 12
37+
node-version: 14
3538
cache: 'npm'
3639
cache-dependency-path: |
3740
src/package-lock.json
@@ -91,11 +94,11 @@ jobs:
9194
printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
9295
-
9396
name: Checkout repository
94-
uses: actions/checkout@v2
97+
uses: actions/checkout@v3
9598
-
9699
uses: actions/setup-node@v3
97100
with:
98-
node-version: 12
101+
node-version: 14
99102
cache: 'npm'
100103
cache-dependency-path: |
101104
src/package-lock.json

0 commit comments

Comments
 (0)