From 94a376d31b6b02972f631fe8bee7cb5938f29251 Mon Sep 17 00:00:00 2001 From: jakcron Date: Wed, 13 Apr 2022 15:15:25 +0800 Subject: [PATCH] Tweak CTRTool build script. --- .github/workflows/Build_CTRTool.yml | 31 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/Build_CTRTool.yml b/.github/workflows/Build_CTRTool.yml index 3e5aed4..aa5a54e 100644 --- a/.github/workflows/Build_CTRTool.yml +++ b/.github/workflows/Build_CTRTool.yml @@ -20,23 +20,27 @@ jobs: - dist: ubuntu_x86_64 os: ubuntu-latest arch: x86_64 + makeArgs: -j$(nproc) - dist: macos_x86_64 os: macos-latest arch: x86_64 + makeArgs: -j$(sysctl -n hw.activecpu) - dist: macos_arm64 os: macos-latest arch: arm64 + makeArgs: -j$(sysctl -n hw.activecpu) steps: - - uses: actions/checkout@v1 - - name: Clone submodules - run: git submodule init && git submodule update - - name: Compile ${{ matrix.prog }} - working-directory: ${{ matrix.prog }} - run: make PROJECT_PLATFORM_ARCH=${{ matrix.arch }} deps all - - uses: actions/upload-artifact@v2 - with: - name: ${{ matrix.prog }}-${{ matrix.dist }} - path: ./${{ matrix.prog }}/bin/${{ matrix.prog }} + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Compile ${{ matrix.prog }} + working-directory: ${{ matrix.prog }} + run: make ${{ matrix.makeArgs }} PROJECT_PLATFORM_ARCH=${{ matrix.arch }} deps all + - uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.prog }}-${{ matrix.dist }} + path: ./${{ matrix.prog }}/bin/${{ matrix.prog }} + if-no-files-found: error build_visualstudio: name: Compile ${{ matrix.prog }} for ${{ matrix.dist }} runs-on: ${{ matrix.os }} @@ -56,15 +60,16 @@ jobs: configuration: Release build_path: Release steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 - - name: Clone submodules - run: git submodule init && git submodule update - name: Compile ${{ matrix.prog }} run: msbuild .\${{ matrix.prog }}\build\visualstudio\${{ matrix.prog }}.sln /p:configuration=${{ matrix.configuration }} /p:platform=${{ matrix.platform }} - uses: actions/upload-artifact@v2 with: name: ${{ matrix.prog }}-${{ matrix.dist }} path: .\${{ matrix.prog }}\build\visualstudio\${{ matrix.build_path }}\${{ matrix.prog }}.exe + if-no-files-found: error