Merge pull request #1274 from golemfactory/ci/goth-workflow-separated

[CI] Restore build steps
golemfactory · May 24, 2021 · 6fc49fe · 6fc49fe
1 parent bbba4ae
commit 6fc49fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/.github/workflows/goth.yml b/.github/workflows/goth.yml
@@ -6,17 +6,6 @@ on:
     types: [completed]
 
 jobs:
-  everytime:
-    name: Dummy job
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.workflow_run.head_branch }}
-      - run: git branch
-      - run: env
-      - run: echo '${{ toJSON(github.event) }}'
-
   integration-test:
     name: Integration Tests
     runs-on: goth
@@ -65,6 +54,8 @@ jobs:
           poetry run poe goth-assets
           poetry run poe goth-tests --config-override docker-compose.build-environment.commit-hash=${{ github.event.workflow_run.head_sha }}
 
+        # poetry run poe goth-tests --config-override docker-compose.build-environment.binary-path=/tmp/yagna-build
+
       - name: Upload test logs
         uses: actions/upload-artifact@v2
         if: always()

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -32,41 +32,38 @@ jobs:
           components: rustfmt, clippy
 
       - name: Check lockfile
-        if: false #TODO: restore
         uses: actions-rs/cargo@v1
         with:
           command: tree
           args: --locked
 
       - name: Check formatting
-        if: false #TODO: restore
         uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: --all -- --check
 
       - name: Install openssl ( Windows only )
-        if: false #TODO: restore runner.os == 'Windows'
+        if: runner.os == 'Windows'
         run: |
           vcpkg install openssl:x64-windows openssl:x64-windows-static
           vcpkg list
           vcpkg integrate install
 
       - name: Unit tests
-        if: false #TODO: restore
         uses: actions-rs/cargo@v1
         with:
           command: test
           args: --workspace --locked
 
       - name: Unit tests for SGX
-        if: false #TODO: restore ${{ runner.os == 'Linux' && startsWith( github.head_ref, 'market/' ) }}
+        if: ${{ runner.os == 'Linux' && startsWith( github.head_ref, 'sgx/' ) }}
         working-directory: exe-unit
         run: cargo test --features sgx
 
       - name: Market Test Suite (semi-integration tests)
         uses: actions-rs/cargo@v1
-        if: false #TODO: restore startsWith( github.head_ref, 'market/' )
+        if: startsWith( github.head_ref, 'market/' )
         with:
           command: test
           # Due to cargo quirks it is more efficient to run all tests from workspace as:
@@ -77,14 +74,12 @@ jobs:
           args: --tests --workspace --features ya-market/test-suite
 
       - name: Build binaries
-        if: false #TODO: restore
         uses: actions-rs/cargo@v1
         with:
           command: build
           args: --workspace
 
       - name: Copy binaries
-        if: false #TODO: restore
         shell: bash
         run: |
           mkdir build
@@ -102,7 +97,6 @@ jobs:
           fi
 
       - name: Upload binaries
-        if: false #TODO: restore
         uses: actions/upload-artifact@v1
         with:
           name: Yagna ${{ runner.os }}