Skip to content

Commit

Permalink
Merge pull request #2128 from wh201906/faster_CI
Browse files Browse the repository at this point in the history
Faster CI
  • Loading branch information
iceman1001 authored Oct 14, 2023
2 parents 0490dc9 + 531ab9b commit 3ff4263
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 20 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,12 @@ jobs:
- name: Build
env:
V: 1
run: make
run: make -j$((`sysctl -n hw.ncpu` + 1))

- name: Test
run: make check

macos-make-btaddon:
if: always()
needs: [macos-make]
runs-on: macos-latest

steps:
Expand Down Expand Up @@ -93,14 +91,12 @@ jobs:
env:
V: 1
PLATFORM_EXTRAS: BTADDON
run: make
run: make -j$((`sysctl -n hw.ncpu` + 1))

- name: Test
run: make check

macos-cmake:
if: always()
needs: [macos-make, macos-make-btaddon]
runs-on: macos-latest

steps:
Expand Down Expand Up @@ -144,7 +140,7 @@ jobs:
- name: Build
env:
VERBOSE: 1
run: make
run: make -j$((`sysctl -n hw.ncpu` + 1))
working-directory: client/build/

- name: Test
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,12 @@ jobs:
- name: Build
env:
V: 1
run: make
run: make -j$((`nproc` + 1))

- name: Test
run: make check

ubuntu-make-btaddon:
if: always()
needs: [ubuntu-make]
runs-on: ubuntu-latest

steps:
Expand All @@ -74,14 +72,12 @@ jobs:
env:
V: 1
PLATFORM_EXTRAS: BTADDON
run: make
run: make -j$((`nproc` + 1))

- name: Test
run: make check

ubuntu-cmake:
if: always()
needs: [ubuntu-make, ubuntu-make-btaddon]
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -115,7 +111,7 @@ jobs:
- name: Build
env:
VERBOSE: 1
run: make
run: make -j$((`nproc` + 1))
working-directory: client/build/

- name: Test
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
run: make clean

- name: Build
run: make V=1
run: make -j $([System.Environment]::ProcessorCount + 1) V=1

- name: Test
run: make check
Expand All @@ -63,7 +63,7 @@ jobs:
run: make clean

- name: Build btaddon
run: make V=1 PLATFORM_EXTRAS=BTADDON
run: make -j $([System.Environment]::ProcessorCount + 1) V=1 PLATFORM_EXTRAS=BTADDON

- name: Test btaddon
run: make check
Expand All @@ -84,7 +84,7 @@ jobs:
working-directory: client/build/

- name: Build cmake
run: make VERBOSE=1
run: make -j $([System.Environment]::ProcessorCount + 1) VERBOSE=1
working-directory: client/build/

- name: Test cmake
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
run: make clean

- name: Build
run: make V=1
run: make -j$((`nproc` + 1)) V=1

- name: Test
run: make check
Expand All @@ -150,7 +150,7 @@ jobs:
run: make clean

- name: Build btaddon
run: make V=1 PLATFORM_EXTRAS=BTADDON
run: make -j$((`nproc` + 1)) V=1 PLATFORM_EXTRAS=BTADDON

- name: Test btaddon
run: make check
Expand All @@ -171,7 +171,7 @@ jobs:
working-directory: client/build/

- name: Build cmake
run: make VERBOSE=1
run: make -j$((`nproc` + 1)) VERBOSE=1
working-directory: client/build/

- name: Test cmake
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...

## [unreleased][unreleased]
- Changed CI scripts to speed up the builds (@wh201906)
- Changed the timeout of local TCP connections (@wh201906)
- Finalized implementation of configcard generation for keyroll when cardhelper is not present (@Antiklesys)
- Added documentation for compiling on iOS (@The-SamminAter)
Expand Down

0 comments on commit 3ff4263

Please sign in to comment.