Merge master (not compiling)

golemfactory · Mar 24, 2023 · 6b81528 · 6b81528
2 parents f9f8c64 + 0613952
commit 6b81528
Show file tree

Hide file tree

Showing 120 changed files with 4,337 additions and 2,131 deletions.
diff --git a/.github/workflows/binaries-aarch64.yml b/.github/workflows/binaries-aarch64.yml
@@ -1,10 +1,6 @@
 name: Build binaries (aarch64)
 
 on:
-  push:
-    branches:
-      - master
-      - release/*
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/binaries-x86-64-hybrid-net.yml b/.github/workflows/binaries-x86-64-hybrid-net.yml
@@ -1,10 +1,6 @@
 name: Build binaries (x86-64) hybrid-net
 
 on:
-  push:
-    branches:
-      - master
-      - release/*
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
@@ -1,10 +1,6 @@
 name: Build binaries (x86-64)
 
 on:
-  push:
-    branches:
-      - master
-      - release/*
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/integration-test-hybrid-net.yml b/.github/workflows/integration-test-hybrid-net.yml
@@ -1,10 +1,6 @@
 name: Goth integration tests (hybrid-net)
 
 on:
-  push:
-    branches:
-      - master
-      - release/*
   pull_request:
     branches:
       - master
@@ -22,18 +18,19 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           checkName: "Build binaries (x86-64) hybrid-net (ubuntu-latest)"
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          intervalSeconds: 60
           timeoutSeconds: 7200
 
       - name: Fail if build was not a success ( ubuntu )
         run: echo job status= ${{ steps.wait-for-build-ubu.outputs.conclusion }} && ${{ fromJSON('["false", "true"]')[steps.wait-for-build-ubu.outputs.conclusion == 'success'] }}
 
   integration-test:
     name: Integration Tests (hybrid-net)
-    runs-on: goth
+    runs-on: [goth, ubuntu-18.04]
     needs: test_check
     defaults:
       run:
-        working-directory: './goth_tests'
+        working-directory: "./goth_tests"
 
     steps:
       - name: Checkout
@@ -44,13 +41,13 @@ jobs:
       - name: Configure Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8.0'
+          python-version: "3.8.0"
 
       - name: Configure Poetry
         uses: Gr1N/setup-poetry@v7
         with:
           poetry-version: 1.2.2
-          working-directory: './goth_tests'
+          working-directory: "./goth_tests"
 
       - name: Install dependencies
         run: poetry install --no-root
@@ -80,7 +77,7 @@ jobs:
           workflow: binaries-x86-64-hybrid-net.yml
           commit: ${{github.event.pull_request.head.sha || github.sha}}
           workflow_conclusion: success
-          name: 'Yagna Linux hybrid-net'
+          name: "Yagna Linux hybrid-net"
           path: /tmp/yagna-build
 
       - name: Run test suite

diff --git a/.github/workflows/integration-test-nightly.yml b/.github/workflows/integration-test-nightly.yml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       matrix: ${{ fromJson(needs.prepare-matrix.outputs.matrix-json) }}
       fail-fast: false
-    runs-on: goth
+    runs-on: [goth, ubuntu-18.04]
     name: Integration Tests (nightly) @ ${{ matrix.branch }}
     defaults:
       run:

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -1,10 +1,6 @@
 name: Goth integration tests
 
 on:
-  push:
-    branches:
-      - master
-      - release/*
   pull_request:
     branches:
       - master
@@ -22,18 +18,19 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           checkName: "Build binaries (x86-64) (ubuntu-latest)"
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          intervalSeconds: 60
           timeoutSeconds: 7200
 
       - name: Fail if build was not a success ( ubuntu )
         run: echo job status= ${{ steps.wait-for-build-ubu.outputs.conclusion }} && ${{ fromJSON('["false", "true"]')[steps.wait-for-build-ubu.outputs.conclusion == 'success'] }}
 
   integration-test:
     name: Integration Tests
-    runs-on: goth
+    runs-on: [goth, ubuntu-18.04]
     needs: test_check
     defaults:
       run:
-        working-directory: './goth_tests'
+        working-directory: "./goth_tests"
 
     steps:
       - name: Checkout
@@ -44,13 +41,13 @@ jobs:
       - name: Configure Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8.0'
+          python-version: "3.8.0"
 
       - name: Configure Poetry
         uses: Gr1N/setup-poetry@v7
         with:
           poetry-version: 1.2.2
-          working-directory: './goth_tests'
+          working-directory: "./goth_tests"
 
       - name: Install dependencies
         run: poetry install --no-root
@@ -80,7 +77,7 @@ jobs:
           workflow: binaries-x86-64.yml
           commit: ${{github.event.pull_request.head.sha || github.sha}}
           workflow_conclusion: success
-          name: 'Yagna Linux'
+          name: "Yagna Linux"
           path: /tmp/yagna-build
 
       - name: Run test suite

diff --git a/.github/workflows/market-test-suite.yml b/.github/workflows/market-test-suite.yml
@@ -1,10 +1,6 @@
 name: Market Test Suite
 
 on:
-  push:
-    branches:
-      - master
-      - release/*
   pull_request:
     branches:
       - master
@@ -53,4 +49,3 @@ jobs:
         with:
           command: test
           args: --tests -p ya-market --features ya-market/test-suite --locked
-
diff --git a/.github/workflows/unit-test-sgx.yml b/.github/workflows/unit-test-sgx.yml
@@ -1,10 +1,6 @@
 name: SGX Unit Tests
 
 on:
-  push:
-    branches:
-      - master
-      - release/*
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -1,10 +1,6 @@
 name: Unit Tests
 
 on:
-  push:
-    branches:
-      - master
-      - release/*
   pull_request:
     branches:
       - master