Skip to content

Commit abe4896

Browse files
Merge pull request #30 from iExecBlockchainComputing/move-to-trunk
refactor: migrate from develop branch to trunk-based development
2 parents 3385b75 + ccaafab commit abe4896

File tree

2 files changed

+587
-338
lines changed

2 files changed

+587
-338
lines changed

.drone.yml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ steps:
8686
- ipfs
8787

8888
- name: market-mongo
89-
image: mongo:6.0.3
89+
image: mongo:6.0.21
9090
detach: true
9191
expose:
9292
- 27017
@@ -362,7 +362,7 @@ trigger:
362362
target:
363363
- sdk-nightly
364364
branch:
365-
- develop
365+
- main
366366

367367
steps:
368368
- name: install
@@ -439,7 +439,7 @@ steps:
439439
- set-version-nightly
440440
when:
441441
branch:
442-
- develop
442+
- main
443443

444444
---
445445
# sdk @iexec/web3telegram publish npm latest pipeline
@@ -584,7 +584,7 @@ trigger:
584584
target:
585585
- dapp-dev-non-tee
586586
branch:
587-
- develop
587+
- main
588588

589589
steps:
590590
- name: install
@@ -747,7 +747,6 @@ trigger:
747747
- dapp-dev
748748
- dapp-prod
749749
branch:
750-
- develop
751750
- main
752751

753752
steps:
@@ -758,8 +757,6 @@ steps:
758757
when:
759758
target:
760759
- dapp-dev
761-
branch:
762-
- develop
763760

764761
- name: get scone fingerprint (prod)
765762
# /!\: maintain the version here
@@ -769,8 +766,6 @@ steps:
769766
when:
770767
target:
771768
- dapp-prod
772-
branch:
773-
- main
774769

775770
- name: install deps
776771
image: node:18.19
@@ -841,7 +836,7 @@ steps:
841836
target:
842837
- dapp-dev
843838
branch:
844-
- develop
839+
- main
845840

846841
- name: add resource to whitelist prod
847842
image: node:18.12.1
@@ -885,7 +880,6 @@ trigger:
885880
- dapp-publish-sell-order-dev
886881
- dapp-publish-sell-order-prod
887882
branch:
888-
- develop
889883
- main
890884

891885
steps:
@@ -925,7 +919,6 @@ trigger:
925919
- dapp-revoke-sell-order-dev
926920
- dapp-revoke-sell-order-prod
927921
branch:
928-
- develop
929922
- main
930923

931924
steps:
@@ -963,7 +956,6 @@ trigger:
963956
- dapp-push-secret-dev
964957
- dapp-push-secret-prod
965958
branch:
966-
- develop
967959
- main
968960
steps:
969961
- name: install deps
@@ -987,8 +979,6 @@ steps:
987979
when:
988980
target:
989981
- dapp-push-secret-dev
990-
branch:
991-
- develop
992982

993983
- name: push dapp secret prod
994984
image: node:18.19
@@ -1004,8 +994,6 @@ steps:
1004994
when:
1005995
target:
1006996
- dapp-push-secret-prod
1007-
branch:
1008-
- main
1009997
commands:
1010998
- cd deployment-dapp
1011999
- npm run push-dapp-secret
@@ -1022,7 +1010,6 @@ trigger:
10221010
- add-resource-to-whitelist-dev
10231011
- add-resource-to-whitelist-prod
10241012
branch:
1025-
- develop
10261013
- main
10271014

10281015
steps:
@@ -1051,8 +1038,6 @@ steps:
10511038
when:
10521039
target:
10531040
- add-resource-to-whitelist-dev
1054-
branch:
1055-
- develop
10561041

10571042
- name: add resource to whitelist prod
10581043
image: node:18.12.1
@@ -1084,7 +1069,6 @@ trigger:
10841069
- remove-resource-from-whitelist-dev
10851070
- remove-resource-from-whitelist-prod
10861071
branch:
1087-
- develop
10881072
- main
10891073

10901074
steps:
@@ -1113,8 +1097,6 @@ steps:
11131097
when:
11141098
target:
11151099
- remove-resource-from-whitelist-dev
1116-
branch:
1117-
- develop
11181100

11191101
- name: remove resource from whitelist prod
11201102
image: node:18.12.1
@@ -1146,7 +1128,6 @@ trigger:
11461128
- transfer-ownership-whitelist-smart-contract-dev
11471129
- transfer-ownership-whitelist-smart-contract-prod
11481130
branch:
1149-
- develop
11501131
- main
11511132

11521133
steps:
@@ -1176,7 +1157,7 @@ steps:
11761157
target:
11771158
- transfer-ownership-whitelist-smart-contract-dev
11781159
branch:
1179-
- develop
1160+
- main
11801161

11811162
- name: transfer ownsership prod
11821163
image: node:18.12.1
@@ -1260,7 +1241,6 @@ trigger:
12601241
- configure-ens-dev
12611242
- configure-ens-prod
12621243
branch:
1263-
- develop
12641244
- main
12651245

12661246
steps:

0 commit comments

Comments
 (0)