Skip to content

Commit

Permalink
Compile with 4 threads on Jenkins builds, the build slaves were upgraded
Browse files Browse the repository at this point in the history
  • Loading branch information
bearbin committed Jun 23, 2021
1 parent 5b8b6ee commit e77a4ab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion jenkinsbuild.sh
Expand Up @@ -64,7 +64,7 @@ fi

# Build
CXX=$CXXCOMP CC=$CCOMP cmake . -DNO_NATIVE_OPTIMIZATION=1 ${CACHE_ARGS} ${TOOLCHAINFILE} ${COMPILEMODE} ${FORCE32}
make -j 2
make -j 4


# Package Server
Expand Down

4 comments on commit e77a4ab

@tigerw
Copy link
Member

@tigerw tigerw commented on e77a4ab Jul 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do the same here?

sh './clang-tidy.sh -j 3'

@tigerw
Copy link
Member

@tigerw tigerw commented on e77a4ab Jul 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cmake --build . --parallel 3;

ctest --output-on-failure --parallel 2;

@12xx12
Copy link
Member

@12xx12 12xx12 commented on e77a4ab Jul 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do the same here?

sh './clang-tidy.sh -j 3'

The machine doing the Jenkins testing is only rented with 3 cores. So that makes sense.

cuberite/travisbuild.sh

Line 38 in 3e8c945

We ditched any travis stuff. This should be gone.

I actually don't know which sever is doing the release builds. I can't tell you anything about that

@bearbin
Copy link
Member Author

@bearbin bearbin commented on e77a4ab Jul 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do the same here?

sh './clang-tidy.sh -j 3'

Yes, it would be a good idea to make this consistent.

cmake --build . --parallel 3;

ctest --output-on-failure --parallel 2;

I'm not sure if this would have a positive effect or not, because both the GCC and clang builds run at the same time on the same build slave, adding up to 4 threads at once. This would probably be better tested empirically.

Can we do the same here?

sh './clang-tidy.sh -j 3'

The machine doing the Jenkins testing is only rented with 3 cores. So that makes sense.

cuberite/travisbuild.sh
Line 38 in 3e8c945

We ditched any travis stuff. This should be gone.

I actually don't know which sever is doing the release builds. I can't tell you anything about that

re 4 threads on a 3 core machine - it shouldn't have much of any negative performance impact to use more cores than the machine has available, as long as there's enough memory that we don't get exhaustion.

re the existence of travisbuild.sh - it's not quite right that we can just delete it now: the builds were moved on to the cuberite buildserver, but they still run travisbuild.sh - I will rename to something more appropriate.

re build slaves: as a security measure, builds have been disabed on the build master, so all builds are performed on the slaves. At present, that means that builds are performed on @12xx12's build slave, with additional slaves being provisioned from OVH cloud to handle spikes in demand (i.e. when there's a commit to master or multiple PRs to build at once)

Please sign in to comment.