mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 13:10:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

GHA: Use all 4 new CPU cores on non-Mac runners (#16070)

Browse source 
see https://github.blog/2024-01-17-github-hosted-runners-double-the-power-for-open-source/
This commit is contained in:
Martin Kinkelin 2024-01-22 14:05:43 +01:00 • committed by GitHub
parent 5cb1c7df67
commit b20a5f134d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View file

@ -77,7 +77,7 @@ jobs:
OS_NAME: ${{ startsWith(matrix.os, 'ubuntu') && 'linux' || (startsWith(matrix.os, 'macos') && 'osx' || (startsWith(matrix.os, 'windows') && 'windows' || '')) }} OS_NAME: ${{ startsWith(matrix.os, 'ubuntu') && 'linux' || (startsWith(matrix.os, 'macos') && 'osx' || (startsWith(matrix.os, 'windows') && 'windows' || '')) }}
MODEL: ${{ matrix.model || '64' }} MODEL: ${{ matrix.model || '64' }}
HOST_DMD: ${{ matrix.host_dmd }} HOST_DMD: ${{ matrix.host_dmd }}
N: ${{ startsWith(matrix.os, 'macos') && '3' || '2' }} N: ${{ startsWith(matrix.os, 'macos') && '3' || '4' }}
FULL_BUILD: true FULL_BUILD: true
# for coverage: # for coverage:
DMD_TEST_COVERAGE: ${{ matrix.coverage && '1' || '0' }} DMD_TEST_COVERAGE: ${{ matrix.coverage && '1' || '0' }}

24
.github/workflows/runnable_cxx.yml vendored
View file

@ -135,6 +135,8 @@ jobs:
# Using a specific version for reproductibility. # Using a specific version for reproductibility.
# Feel free to update when a new release has matured. # Feel free to update when a new release has matured.
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
env:
N: ${{ startsWith(matrix.os, 'macos') && '3' || '4' }}
steps: steps:
######################################## ########################################
@ -292,33 +294,31 @@ jobs:
######################################## ########################################
- name: '[Posix] Build compiler & standard library' - name: '[Posix] Build compiler & standard library'
if: runner.os != 'Windows' if: runner.os != 'Windows'
# By default, VMs have 2 processors available, hence the `-j2`:
# https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners#supported-runners-and-hardware-resources
run: | run: |
# All hosts are 64 bits but let's be explicit # All hosts are 64 bits but let's be explicit
./dmd/compiler/src/build.d -j2 MODEL=64 ./dmd/compiler/src/build.d -j$N MODEL=64
make -C dmd/druntime -j2 MODEL=64 make -C dmd/druntime -j$N MODEL=64
make -C phobos -j2 MODEL=64 make -C phobos -j$N MODEL=64
# Both version can live side by side (they end up in a different directory) # Both version can live side by side (they end up in a different directory)
# However, since clang does not provide a multilib package, only test 32 bits with g++ # However, since clang does not provide a multilib package, only test 32 bits with g++
if [ ${{ matrix.compiler }} == "g++" ]; then if [ ${{ matrix.compiler }} == "g++" ]; then
./dmd/compiler/src/build.d install -j2 MODEL=32 ./dmd/compiler/src/build.d install -j$N MODEL=32
make -C dmd/druntime install -j2 MODEL=32 make -C dmd/druntime install -j$N MODEL=32
make -C phobos install -j2 MODEL=32 make -C phobos install -j$N MODEL=32
fi fi
- name: '[Windows] Build compiler & standard library' - name: '[Windows] Build compiler & standard library'
if: runner.os == 'Windows' if: runner.os == 'Windows'
shell: bash shell: bash
run: | run: |
dmd -run dmd/compiler/src/build.d -j2 MODEL=64 dmd -run dmd/compiler/src/build.d -j$N MODEL=64
if [ $? -ne 0 ]; then return 1; fi if [ $? -ne 0 ]; then return 1; fi
# Note: Only CC for druntime and AR for Phobos are required ATM, # Note: Only CC for druntime and AR for Phobos are required ATM,
# but providing all three to avoid surprise for future contributors # but providing all three to avoid surprise for future contributors
# Those should really be in the path, though. # Those should really be in the path, though.
make -j2 -C dmd/druntime make -j$N -C dmd/druntime
if [ $? -ne 0 ]; then return 1; fi if [ $? -ne 0 ]; then return 1; fi
make -j2 -C phobos make -j$N -C phobos
if [ $? -ne 0 ]; then return 1; fi if [ $? -ne 0 ]; then return 1; fi
######################################## ########################################
@ -340,7 +340,7 @@ jobs:
if: runner.os == 'Windows' if: runner.os == 'Windows'
shell: bash shell: bash
run: | run: |
make -j2 -C dmd/druntime test/stdcpp/.run make -j$N -C dmd/druntime test/stdcpp/.run
if [ $? -ne 0 ]; then return 1; fi if [ $? -ne 0 ]; then return 1; fi
######################################## ########################################