Skip to content

Commit fe62709

Browse files
committed
Merge branch 'preview' into feat/inbox-settings and translations
2 parents 05c7dc5 + 993c789 commit fe62709

File tree

708 files changed

+45701
-8606
lines changed

Some content is hidden

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

708 files changed

+45701
-8606
lines changed

.env.example

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,9 @@ USE_MINIO=1
3838

3939
# Nginx Configuration
4040
NGINX_PORT=80
41+
42+
# Force HTTPS for handling SSL Termination
43+
MINIO_ENDPOINT_SSL=0
44+
45+
# API key rate limit
46+
API_KEY_RATE_LIMIT="60/minute"

.github/workflows/build-aio-branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888

8989
full_build_push:
9090
if: ${{ needs.branch_build_setup.outputs.do_full_build == 'true' }}
91-
runs-on: ubuntu-20.04
91+
runs-on: ubuntu-22.04
9292
needs: [branch_build_setup]
9393
env:
9494
BUILD_TYPE: full
@@ -148,7 +148,7 @@ jobs:
148148

149149
slim_build_push:
150150
if: ${{ needs.branch_build_setup.outputs.do_slim_build == 'true' }}
151-
runs-on: ubuntu-20.04
151+
runs-on: ubuntu-22.04
152152
needs: [branch_build_setup]
153153
env:
154154
BUILD_TYPE: slim

.github/workflows/build-branch.yml

Lines changed: 3 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ jobs:
4747
gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
4848
gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
4949
gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
50-
build_proxy: ${{ steps.changed_files.outputs.proxy_any_changed }}
51-
build_apiserver: ${{ steps.changed_files.outputs.apiserver_any_changed }}
52-
build_admin: ${{ steps.changed_files.outputs.admin_any_changed }}
53-
build_space: ${{ steps.changed_files.outputs.space_any_changed }}
54-
build_web: ${{ steps.changed_files.outputs.web_any_changed }}
55-
build_live: ${{ steps.changed_files.outputs.live_any_changed }}
5650

5751
dh_img_web: ${{ steps.set_env_variables.outputs.DH_IMG_WEB }}
5852
dh_img_space: ${{ steps.set_env_variables.outputs.DH_IMG_SPACE }}
@@ -123,46 +117,7 @@ jobs:
123117
name: Checkout Files
124118
uses: actions/checkout@v4
125119

126-
- name: Get changed files
127-
id: changed_files
128-
uses: tj-actions/changed-files@v42
129-
with:
130-
files_yaml: |
131-
apiserver:
132-
- apiserver/**
133-
proxy:
134-
- nginx/**
135-
admin:
136-
- admin/**
137-
- packages/**
138-
- "package.json"
139-
- "yarn.lock"
140-
- "tsconfig.json"
141-
- "turbo.json"
142-
space:
143-
- space/**
144-
- packages/**
145-
- "package.json"
146-
- "yarn.lock"
147-
- "tsconfig.json"
148-
- "turbo.json"
149-
web:
150-
- web/**
151-
- packages/**
152-
- "package.json"
153-
- "yarn.lock"
154-
- "tsconfig.json"
155-
- "turbo.json"
156-
live:
157-
- live/**
158-
- packages/**
159-
- 'package.json'
160-
- 'yarn.lock'
161-
- 'tsconfig.json'
162-
- 'turbo.json'
163-
164120
branch_build_push_admin:
165-
if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
166121
name: Build-Push Admin Docker Image
167122
runs-on: ubuntu-22.04
168123
needs: [branch_build_setup]
@@ -185,7 +140,6 @@ jobs:
185140
buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
186141

187142
branch_build_push_web:
188-
if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
189143
name: Build-Push Web Docker Image
190144
runs-on: ubuntu-22.04
191145
needs: [branch_build_setup]
@@ -208,7 +162,6 @@ jobs:
208162
buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
209163

210164
branch_build_push_space:
211-
if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
212165
name: Build-Push Space Docker Image
213166
runs-on: ubuntu-22.04
214167
needs: [branch_build_setup]
@@ -231,7 +184,6 @@ jobs:
231184
buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
232185

233186
branch_build_push_live:
234-
if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
235187
name: Build-Push Live Collaboration Docker Image
236188
runs-on: ubuntu-22.04
237189
needs: [branch_build_setup]
@@ -254,7 +206,6 @@ jobs:
254206
buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
255207

256208
branch_build_push_apiserver:
257-
if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
258209
name: Build-Push API Server Docker Image
259210
runs-on: ubuntu-22.04
260211
needs: [branch_build_setup]
@@ -277,7 +228,6 @@ jobs:
277228
buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
278229

279230
branch_build_push_proxy:
280-
if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
281231
name: Build-Push Proxy Docker Image
282232
runs-on: ubuntu-22.04
283233
needs: [branch_build_setup]
@@ -299,31 +249,6 @@ jobs:
299249
buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
300250
buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
301251

302-
attach_assets_to_build:
303-
if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
304-
name: Attach Assets to Release
305-
runs-on: ubuntu-22.04
306-
needs: [branch_build_setup]
307-
steps:
308-
- name: Checkout
309-
uses: actions/checkout@v4
310-
311-
- name: Update Assets
312-
run: |
313-
cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
314-
315-
- name: Attach Assets
316-
id: attach_assets
317-
uses: actions/upload-artifact@v4
318-
with:
319-
name: selfhost-assets
320-
retention-days: 2
321-
path: |
322-
${{ github.workspace }}/deploy/selfhost/setup.sh
323-
${{ github.workspace }}/deploy/selfhost/restore.sh
324-
${{ github.workspace }}/deploy/selfhost/docker-compose.yml
325-
${{ github.workspace }}/deploy/selfhost/variables.env
326-
327252
publish_release:
328253
if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
329254
name: Build Release
@@ -337,7 +262,6 @@ jobs:
337262
branch_build_push_live,
338263
branch_build_push_apiserver,
339264
branch_build_push_proxy,
340-
attach_assets_to_build,
341265
]
342266
env:
343267
REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
@@ -348,6 +272,8 @@ jobs:
348272
- name: Update Assets
349273
run: |
350274
cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
275+
sed -i 's/${APP_RELEASE:-stable}/${APP_RELEASE:-'${REL_VERSION}'}/g' deploy/selfhost/docker-compose.yml
276+
sed -i 's/APP_RELEASE=stable/APP_RELEASE='${REL_VERSION}'/g' deploy/selfhost/variables.env
351277
352278
- name: Create Release
353279
id: create_release
@@ -362,6 +288,7 @@ jobs:
362288
generate_release_notes: true
363289
files: |
364290
${{ github.workspace }}/deploy/selfhost/setup.sh
291+
${{ github.workspace }}/deploy/selfhost/swarm.sh
365292
${{ github.workspace }}/deploy/selfhost/restore.sh
366293
${{ github.workspace }}/deploy/selfhost/docker-compose.yml
367294
${{ github.workspace }}/deploy/selfhost/variables.env

.github/workflows/build-test-pull-request.yml

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,9 @@ on:
66
types: ["opened", "synchronize", "ready_for_review"]
77

88
jobs:
9-
get-changed-files:
10-
if: github.event.pull_request.draft == false
11-
runs-on: ubuntu-latest
12-
outputs:
13-
apiserver_changed: ${{ steps.changed-files.outputs.apiserver_any_changed }}
14-
admin_changed: ${{ steps.changed-files.outputs.admin_any_changed }}
15-
space_changed: ${{ steps.changed-files.outputs.space_any_changed }}
16-
web_changed: ${{ steps.changed-files.outputs.web_any_changed }}
17-
steps:
18-
- uses: actions/checkout@v4
19-
- name: Get changed files
20-
id: changed-files
21-
uses: tj-actions/changed-files@v44
22-
with:
23-
files_yaml: |
24-
apiserver:
25-
- apiserver/**
26-
admin:
27-
- admin/**
28-
- packages/**
29-
- 'package.json'
30-
- 'yarn.lock'
31-
- 'tsconfig.json'
32-
- 'turbo.json'
33-
space:
34-
- space/**
35-
- packages/**
36-
- 'package.json'
37-
- 'yarn.lock'
38-
- 'tsconfig.json'
39-
- 'turbo.json'
40-
web:
41-
- web/**
42-
- packages/**
43-
- 'package.json'
44-
- 'yarn.lock'
45-
- 'tsconfig.json'
46-
- 'turbo.json'
47-
489
lint-apiserver:
49-
needs: get-changed-files
10+
if: github.event.pull_request.draft == false
5011
runs-on: ubuntu-latest
51-
if: needs.get-changed-files.outputs.apiserver_changed == 'true'
5212
steps:
5313
- uses: actions/checkout@v4
5414
- name: Set up Python
@@ -63,8 +23,7 @@ jobs:
6323
run: ruff check --fix apiserver
6424

6525
lint-admin:
66-
needs: get-changed-files
67-
if: needs.get-changed-files.outputs.admin_changed == 'true'
26+
if: github.event.pull_request.draft == false
6827
runs-on: ubuntu-latest
6928
steps:
7029
- uses: actions/checkout@v4
@@ -76,8 +35,7 @@ jobs:
7635
- run: yarn lint --filter=admin
7736

7837
lint-space:
79-
needs: get-changed-files
80-
if: needs.get-changed-files.outputs.space_changed == 'true'
38+
if: github.event.pull_request.draft == false
8139
runs-on: ubuntu-latest
8240
steps:
8341
- uses: actions/checkout@v4
@@ -89,8 +47,7 @@ jobs:
8947
- run: yarn lint --filter=space
9048

9149
lint-web:
92-
needs: get-changed-files
93-
if: needs.get-changed-files.outputs.web_changed == 'true'
50+
if: github.event.pull_request.draft == false
9451
runs-on: ubuntu-latest
9552
steps:
9653
- uses: actions/checkout@v4

.github/workflows/feature-deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@v4
5252

5353
full_build_push:
54-
runs-on: ubuntu-20.04
54+
runs-on: ubuntu-22.04
5555
needs: [branch_build_setup]
5656
env:
5757
BUILD_TYPE: full

.github/workflows/sync-repo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111

1212
jobs:
1313
sync_changes:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
permissions:
1616
pull-requests: write
1717
contents: read

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,17 @@ pnpm-workspace.yaml
7878
.npmrc
7979
.secrets
8080
tmp/
81+
8182
## packages
8283
dist
8384
.temp/
8485
deploy/selfhost/plane-app/
86+
8587
## Storybook
8688
*storybook.log
8789
output.css
90+
91+
dev-editor
92+
# Redis
93+
*.rdb
94+
*.rdb.gz

0 commit comments

Comments
 (0)