Skip to content

Commit cf8823f

Browse files
sriramveeraghantasriramveeraghanta
authored
Merge pull request #6664 from makeplane/canary
release: v0.25.0
2 parents 9ed4591 + 5f3d026 commit cf8823f

1,718 files changed

Lines changed: 58350 additions & 25563 deletions

File tree

Some content is hidden

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

‎.github/actions/build-push-ce/action.yml‎

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

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

Lines changed: 33 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ on:
2525
required: false
2626
default: false
2727
type: boolean
28+
push:
29+
branches:
30+
- preview
31+
- canary
2832

2933
env:
3034
TARGET_BRANCH: ${{ github.ref_name }}
@@ -36,7 +40,7 @@ env:
3640
jobs:
3741
branch_build_setup:
3842
name: Build Setup
39-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4044
outputs:
4145
gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
4246
gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
@@ -160,20 +164,17 @@ jobs:
160164
branch_build_push_admin:
161165
if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
162166
name: Build-Push Admin Docker Image
163-
runs-on: ubuntu-20.04
167+
runs-on: ubuntu-22.04
164168
needs: [branch_build_setup]
165169
steps:
166-
- id: checkout_files
167-
name: Checkout Files
168-
uses: actions/checkout@v4
169170
- name: Admin Build and Push
170-
uses: ./.github/actions/build-push-ce
171+
uses: makeplane/actions/build-push@v1.0.0
171172
with:
172173
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
173174
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
174175
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
175-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
176-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
176+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
177+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
177178
docker-image-owner: makeplane
178179
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_admin }}
179180
build-context: .
@@ -186,20 +187,17 @@ jobs:
186187
branch_build_push_web:
187188
if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
188189
name: Build-Push Web Docker Image
189-
runs-on: ubuntu-20.04
190+
runs-on: ubuntu-22.04
190191
needs: [branch_build_setup]
191192
steps:
192-
- id: checkout_files
193-
name: Checkout Files
194-
uses: actions/checkout@v4
195193
- name: Web Build and Push
196-
uses: ./.github/actions/build-push-ce
194+
uses: makeplane/actions/build-push@v1.0.0
197195
with:
198196
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
199197
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
200198
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
201-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
202-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
199+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
200+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
203201
docker-image-owner: makeplane
204202
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_web }}
205203
build-context: .
@@ -212,20 +210,17 @@ jobs:
212210
branch_build_push_space:
213211
if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
214212
name: Build-Push Space Docker Image
215-
runs-on: ubuntu-20.04
213+
runs-on: ubuntu-22.04
216214
needs: [branch_build_setup]
217215
steps:
218-
- id: checkout_files
219-
name: Checkout Files
220-
uses: actions/checkout@v4
221216
- name: Space Build and Push
222-
uses: ./.github/actions/build-push-ce
217+
uses: makeplane/actions/build-push@v1.0.0
223218
with:
224219
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
225220
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
226221
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
227-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
228-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
222+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
223+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
229224
docker-image-owner: makeplane
230225
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_space }}
231226
build-context: .
@@ -238,20 +233,17 @@ jobs:
238233
branch_build_push_live:
239234
if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
240235
name: Build-Push Live Collaboration Docker Image
241-
runs-on: ubuntu-20.04
236+
runs-on: ubuntu-22.04
242237
needs: [branch_build_setup]
243238
steps:
244-
- id: checkout_files
245-
name: Checkout Files
246-
uses: actions/checkout@v4
247239
- name: Live Build and Push
248-
uses: ./.github/actions/build-push-ce
240+
uses: makeplane/actions/build-push@v1.0.0
249241
with:
250242
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
251243
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
252244
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
253-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
254-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
245+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
246+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
255247
docker-image-owner: makeplane
256248
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_live }}
257249
build-context: .
@@ -264,20 +256,17 @@ jobs:
264256
branch_build_push_apiserver:
265257
if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
266258
name: Build-Push API Server Docker Image
267-
runs-on: ubuntu-20.04
259+
runs-on: ubuntu-22.04
268260
needs: [branch_build_setup]
269261
steps:
270-
- id: checkout_files
271-
name: Checkout Files
272-
uses: actions/checkout@v4
273262
- name: Backend Build and Push
274-
uses: ./.github/actions/build-push-ce
263+
uses: makeplane/actions/build-push@v1.0.0
275264
with:
276265
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
277266
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
278267
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
279-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
280-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
268+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
269+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
281270
docker-image-owner: makeplane
282271
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_backend }}
283272
build-context: ./apiserver
@@ -290,20 +279,17 @@ jobs:
290279
branch_build_push_proxy:
291280
if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
292281
name: Build-Push Proxy Docker Image
293-
runs-on: ubuntu-20.04
282+
runs-on: ubuntu-22.04
294283
needs: [branch_build_setup]
295284
steps:
296-
- id: checkout_files
297-
name: Checkout Files
298-
uses: actions/checkout@v4
299285
- name: Proxy Build and Push
300-
uses: ./.github/actions/build-push-ce
286+
uses: makeplane/actions/build-push@v1.0.0
301287
with:
302288
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
303289
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
304290
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
305-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
306-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
291+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
292+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
307293
docker-image-owner: makeplane
308294
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_proxy }}
309295
build-context: ./nginx
@@ -316,7 +302,7 @@ jobs:
316302
attach_assets_to_build:
317303
if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
318304
name: Attach Assets to Release
319-
runs-on: ubuntu-20.04
305+
runs-on: ubuntu-22.04
320306
needs: [branch_build_setup]
321307
steps:
322308
- name: Checkout
@@ -334,14 +320,15 @@ jobs:
334320
retention-days: 2
335321
path: |
336322
${{ github.workspace }}/deploy/selfhost/setup.sh
323+
${{ github.workspace }}/deploy/selfhost/swarm.sh
337324
${{ github.workspace }}/deploy/selfhost/restore.sh
338325
${{ github.workspace }}/deploy/selfhost/docker-compose.yml
339326
${{ github.workspace }}/deploy/selfhost/variables.env
340327
341328
publish_release:
342329
if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
343330
name: Build Release
344-
runs-on: ubuntu-20.04
331+
runs-on: ubuntu-22.04
345332
needs:
346333
[
347334
branch_build_setup,
@@ -376,6 +363,7 @@ jobs:
376363
generate_release_notes: true
377364
files: |
378365
${{ github.workspace }}/deploy/selfhost/setup.sh
366+
${{ github.workspace }}/deploy/selfhost/swarm.sh
379367
${{ github.workspace }}/deploy/selfhost/restore.sh
380368
${{ github.workspace }}/deploy/selfhost/docker-compose.yml
381369
${{ github.workspace }}/deploy/selfhost/variables.env

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Setup Node.js
7272
uses: actions/setup-node@v4
7373
with:
74-
node-version: 18.x
74+
node-version: 20.x
7575
- run: yarn install
7676
- run: yarn lint --filter=admin
7777

@@ -84,7 +84,7 @@ jobs:
8484
- name: Setup Node.js
8585
uses: actions/setup-node@v4
8686
with:
87-
node-version: 18.x
87+
node-version: 20.x
8888
- run: yarn install
8989
- run: yarn lint --filter=space
9090

@@ -97,7 +97,7 @@ jobs:
9797
- name: Setup Node.js
9898
uses: actions/setup-node@v4
9999
with:
100-
node-version: 18.x
100+
node-version: 20.x
101101
- run: yarn install
102102
- run: yarn lint --filter=web
103103

@@ -109,7 +109,7 @@ jobs:
109109
- name: Setup Node.js
110110
uses: actions/setup-node@v4
111111
with:
112-
node-version: 18.x
112+
node-version: 20.x
113113
- run: yarn install
114114
- run: yarn build --filter=admin
115115

@@ -121,7 +121,7 @@ jobs:
121121
- name: Setup Node.js
122122
uses: actions/setup-node@v4
123123
with:
124-
node-version: 18.x
124+
node-version: 20.x
125125
- run: yarn install
126126
- run: yarn build --filter=space
127127

@@ -133,6 +133,6 @@ jobs:
133133
- name: Setup Node.js
134134
uses: actions/setup-node@v4
135135
with:
136-
node-version: 18.x
136+
node-version: 20.x
137137
- run: yarn install
138138
- run: yarn build --filter=web

0 commit comments

Comments
 (0)