Merge branch 'master' into merge-master-into-develop

ArkEcosystem · Sep 21, 2021 · 26d49d8 · 26d49d8
2 parents 0c9a923 + c9d089e
commit 26d49d8
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 47 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -18,6 +18,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: '2.7'
             - name: Cache node modules
               uses: actions/cache@v1
               with:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,6 +20,11 @@ jobs:
               with:
                   fetch-depth: 2
 
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: '2.7'
+
             - run: git checkout HEAD^2
               if: ${{ github.event_name == 'pull_request' }}
 

diff --git a/.github/workflows/devnet-sync.yml b/.github/workflows/devnet-sync.yml
@@ -2,27 +2,12 @@ name: Devnet sync
 
 on:
     schedule:
-        - cron: '0 1 * * *'
+        - cron: "0 10 * * *"
 
 jobs:
     devnet-sync:
         runs-on: ubuntu-latest
 
-        services:
-            postgres:
-                image: postgres:10.8
-                env:
-                    POSTGRES_USER: ark
-                    POSTGRES_PASSWORD: password
-                    POSTGRES_DB: ark_unitnet
-                ports:
-                    - 5432:5432
-                options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-        strategy:
-            matrix:
-                node-version: [12.x]
-
         steps:
             - uses: actions/checkout@v2
               with:
@@ -36,30 +21,9 @@ jobs:
             - name: Use Node.js ${{ matrix.node-version }}
               uses: actions/setup-node@v1
               with:
-                  node-version: ${{ matrix.node-version }}
-            - name: Update system
-              run: sudo apt-get update -y
-            - name: Install xsel & postgresql-client
-              run: sudo apt-get install -q xsel postgresql-client
-            - name: Install and build packages
-              run: yarn setup
-            - name: Create .core/database directory
-              run: mkdir -p $HOME/.core/database
-            - name: Make sync script executable
-              run: chmod +x .github/sync-script/sync-script.sh
-            - name: devnet sync
-              run: packages/core/bin/run relay:run --network=devnet > output.log 2> errors.log & .github/sync-script/sync-script.sh
-              env:
-                  CORE_DB_DATABASE: ark_unitnet
-                  CORE_DB_USERNAME: ark
-                  POSTGRES_USER: ark
-                  POSTGRES_PASSWORD: password
-                  POSTGRES_DB: ark_unitnet
-                  CORE_PATH_CONFIG: packages/core/bin/config/devnet
-                  CORE_PATH_DATA: packages/core/bin/config/devnet
-            - name: Last 1000 lines of node output
-              if: always()
-              run: tail -n 1000 output.log
-            - name: Errors (if any)
-              if: always()
-              run: echo "" >> errors.log && tail -n 1000 errors.log
+                  host: ${{ secrets.SYNC_HOST }}
+                  username: ${{ secrets.SYNC_USERNAME }}
+                  password: ${{ secrets.SYNC_PASSWORD }}
+                  port: ${{ secrets.SYNC_PORT }}
+                  script_stop: true
+                  script: bash devnet-sync-result.sh
diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
@@ -81,6 +81,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -133,6 +137,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -188,6 +196,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -243,6 +255,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -298,6 +314,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -353,6 +373,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -408,6 +432,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -463,6 +491,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -518,6 +550,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -573,6 +609,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -628,6 +668,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -683,6 +727,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -738,6 +786,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -793,6 +845,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -848,6 +904,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -903,6 +963,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -958,6 +1022,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v2
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -1178,6 +1246,10 @@ jobs:
 
         steps:
             - uses: actions/checkout@v1
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: "2.7"
             - name: Cache node modules
               uses: actions/cache@v1
               with:

diff --git a/.github/workflows/mainnet-sync.yml b/.github/workflows/mainnet-sync.yml
@@ -0,0 +1,20 @@
+name: Mainnet sync
+
+on:
+    schedule:
+        - cron: '0 10 * * *'
+
+jobs:
+    mainnet-sync:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: executing remote ssh commands using password
+              uses: appleboy/ssh-action@master
+              with:
+                host: ${{ secrets.SYNC_HOST }}
+                username: ${{ secrets.SYNC_USERNAME }}
+                password: ${{ secrets.SYNC_PASSWORD }}
+                port: ${{ secrets.SYNC_PORT }}
+                script_stop: true
+                script: bash mainnet-sync-result.sh
diff --git a/.github/workflows/publish-master.yml b/.github/workflows/publish-master.yml
@@ -12,6 +12,11 @@ jobs:
         steps:
             - uses: actions/checkout@v2
 
+            - name: Set up Python 2.7
+              uses: actions/setup-python@v2
+              with:
+                  python-version: '2.7'
+
             - uses: actions/setup-node@v1
               with:
                   node-version: 12

diff --git a/lerna.json b/lerna.json
@@ -1,10 +1,7 @@
 {
     "lerna": "3.5.0",
     "npmClient": "yarn",
-    "packages": [
-        "packages/*",
-        "plugins/*"
-    ],
+    "packages": ["packages/*", "plugins/*"],
     "useWorkspaces": true,
     "version": "3.0.0-next.38"
 }