ci: fix build binaries (tari-project#3175)

philipr-za · Aug 10, 2021 · 2ded2ac · 2ded2ac
2 parents 33af084 + b736e36
commit 2ded2ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 32 deletions.
diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml
@@ -5,7 +5,8 @@ on:
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
     branches:
-      - leet-*
+      - development
+      - mb-*
   schedule:
     - cron: '05 00 01 * *'
   workflow_dispatch:
@@ -24,31 +25,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-#        # Breaks build - cmake issue?
-#        os: [windows-2016]
-#       # Breaks build - clang build (croaring-sys)?
-#        features: ["safe"]
-#        os: [ubuntu-latest, macos-latest, windows-latest, self-hosted]
-#        os: [ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11.0, windows-2016, windows-2019]
-        os: [ubuntu-18.04, macos-10.15, windows-2019, self-hosted]
+        os: [ubuntu-20.04, macos-10.15, windows-2019]
         # https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
-#        features: ["safe", "avx2"]
-#        target_cpu: ["x86-64", "broadwell", "skylake"]
         target_cpu: ["haswell"]
-#        target_release: ["release", "debug"]
-#        exclude:
-#          - target_cpu: "x86-64"
-#            features: "avx2"
         exclude:
           - os: "macos-10.15"
             target_cpu: "haswell"
-          - os: "self-hosted"
-            target_cpu: "haswell"
         include:
           - os: "macos-10.15"
             target_cpu: "x86-64"
-          - os: "self-hosted"
-            target_cpu: "x86-64"
 
     runs-on: ${{ matrix.os }}
 
@@ -75,14 +60,11 @@ jobs:
     - name: Setup Rust toolchain
       uses: actions-rs/toolchain@v1
       with:
-#        toolchain: stable
         toolchain: nightly-2021-05-09
         components: rustfmt
-#        target: ${{ matrix.target }}
         override: true
 
     - name: Install Linux dependencies - Ubuntu
-#      if: startsWith(matrix.os,'ubuntu')
       if: startsWith(runner.os,'Linux')
       run: |
         sudo apt-get update
@@ -104,12 +86,10 @@ jobs:
 #        sudo apt-get -y upgrade
 
     - name: Install macOS dependencies
-#      if: startsWith(matrix.os,'macos')
       if: startsWith(runner.os,'macOS')
       run: brew install cmake zip
 
     - name: Install Windows dependencies
-#      if: startsWith(matrix.os,'windows')
       if: startsWith(runner.os,'Windows')
       run: |
         vcpkg.exe install sqlite3:x64-windows zlib:x64-windows
@@ -142,15 +122,6 @@ jobs:
         echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV
         echo "C:\Strawberry\perl\bin" >> $GITHUB_PATH
 
-    # this is a hack to fix an issue with building libclang in MSVC
-    # it should be fixed in release 16.9 of MSVC
-    # issue https://github.com/microsoft/STL/issues/1300
-    # temp fix https://github.com/mono/CppSharp/pull/1514/files
-    - name: fix intrin.h file - Windows
-      if: startsWith(runner.os,'Windows')
-      shell: powershell
-      run: .github/hacks/intrin.ps1
-
     - name: Caching
       uses: actions/cache@v2
       with:

diff --git a/integration_tests/features/BaseNodeAutoUpdate.feature b/integration_tests/features/BaseNodeAutoUpdate.feature
@@ -1,6 +1,9 @@
 @auto_update
 Feature: AutoUpdate
 
+
+    # Not sure why this takes so long on CI
+    @long-running
     Scenario: Auto update finds a new update
         Given I have a node NODE_A with auto update enabled
         Then NODE_A has a new software update