Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several GitHub Actions optimizations #1373

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Several GitHub Actions optimizations #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fa4f82
.github/workflows: merge adjacent "apt install"
MaxKellermann Jan 21, 2025
8a4bfd8
.github/workflows: use "apt-get" instead of "apt"
MaxKellermann Jan 21, 2025
35e0e62
.github/workflows/build_linux_*: use ccache to speed up builds
MaxKellermann Jan 21, 2025
5420d8f
.github/workflows: start ninja with the "-C" option
MaxKellermann Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions .github/workflows/build_linux_x86.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ jobs:
echo "Done"

echo && echo "** Installing and setting up compiler and tools" && echo
sudo apt install -yqq --no-install-recommends ninja-build linux-libc-dev:i386 gcc-12 gcc-12-multilib g++-12 g++-12-multilib > /dev/null
sudo apt-get install -yqq --no-install-recommends \
ninja-build linux-libc-dev:i386 gcc-12 gcc-12-multilib g++-12 g++-12-multilib \
ccache \
libc6:i386 libgcc-s1:i386 zlib1g:i386
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12
echo "Done"

# MariaDB dependencies
echo && echo "Install MariaDB dependencies"
echo "Installing some deps with apt..."
sudo apt install -yqq --no-install-recommends libc6:i386 libgcc-s1:i386 zlib1g:i386

echo "Installing libssl1.1 manually from Bionic repo..."
wget --quiet --output-document=dep1.deb http://launchpadlibrarian.net/367327733/libssl1.1_1.1.0g-2ubuntu4_i386.deb
sudo dpkg -r --force-all libssl1.1
Expand Down Expand Up @@ -75,6 +74,10 @@ jobs:
ls /usr/lib/i386-linux-gnu/mariadb
echo "Done"

- name: Set up ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{github.job}}

- name: Report building tools
run: |
Expand All @@ -85,9 +88,12 @@ jobs:
- name: CMake
run: |
mkdir -p build
cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/Linux-GNU-x86.cmake -S ./ -B ./build
cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" \
-DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/Linux-GNU-x86.cmake \
-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-S ./ -B ./build
- name: Ninja
run: cd build && ninja && cd ..
run: ninja -C build
- name: Create package
run: |
mkdir accounts logs save scripts
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/build_linux_x86_64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,17 @@ jobs:
lsb_release -d

sudo add-apt-repository universe && sudo sudo apt-get -qq update
sudo apt install -yq --no-install-recommends ninja-build gcc-12 g++-12 > /dev/null
sudo apt install -yq --no-install-recommends mariadb-client libmariadb-dev
sudo apt-get install -yq --no-install-recommends \
ninja-build gcc-12 g++-12 \
ccache \
mariadb-client libmariadb-dev
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12

- name: Set up ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{github.job}}

- name: Report building tools
run: |
echo "GCC:" && gcc -v
Expand All @@ -38,9 +46,12 @@ jobs:
- name: CMake
run: |
mkdir -p build
cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/Linux-GNU-x86_64.cmake -S ./ -B ./build
cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" \
-DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/Linux-GNU-x86_64.cmake \
-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-S ./ -B ./build
- name: Ninja
run: cd build && ninja && cd ..
run: ninja -C build
- name: Create package
run: |
mkdir accounts logs save scripts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_osx_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
mkdir -p build
cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" -DCMAKE_TOOLCHAIN_FILE="$CMAKE_TCH" -S . -B ./build
- name: Ninja
run: cd build && ninja && cd ..
run: ninja -C build
- name: Create package
run: |
pwd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_osx_x86_64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
mkdir -p build
cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" -DCMAKE_TOOLCHAIN_FILE="$CMAKE_TCH" -S . -B ./build
- name: Ninja
run: cd build && ninja && cd ..
run: ninja -C build
- name: Create package
run: |
pwd
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ jobs:
lsb_release -d

sudo add-apt-repository universe && sudo sudo apt-get -qq update
sudo apt install -yq --no-install-recommends ninja-build gcc-12 g++-12 > /dev/null
sudo apt install -yq --no-install-recommends mariadb-client libmariadb-dev
sudo apt-get install -yq --no-install-recommends \
ninja-build gcc-12 g++-12 \
mariadb-client libmariadb-dev
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12

- name: Report building tools
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/coverity-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ jobs:
- name: Install prerequisites
run: |
sudo add-apt-repository universe && sudo sudo apt-get -qq update
sudo apt install -yq --no-install-recommends ninja-build gcc-12 g++-12 > /dev/null
sudo apt install -yq --no-install-recommends mariadb-client libmariadb-dev
sudo apt-get install -yq --no-install-recommends \
ninja-build gcc-12 g++-12 \
mariadb-client libmariadb-dev
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12

- name: Report building tools
Expand Down