1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-15 22:16:37 +02:00

Reorganized layout of CI directory, move all before_install files into

common directory, remove copy-pasted files
This commit is contained in:
Ivan Savenko 2024-09-06 16:54:49 +00:00
parent 289ed742d0
commit ecf063cd1c
17 changed files with 20 additions and 31 deletions

View File

@ -23,14 +23,17 @@ jobs:
- platform: linux-qt6 - platform: linux-qt6
os: ubuntu-24.04 os: ubuntu-24.04
test: 0 test: 0
before_install: linux_qt6.sh
preset: linux-clang-test preset: linux-clang-test
- platform: linux - platform: linux
os: ubuntu-24.04 os: ubuntu-24.04
test: 1 test: 1
before_install: linux_qt5.sh
preset: linux-gcc-test preset: linux-gcc-test
- platform: linux - platform: linux
os: ubuntu-20.04 os: ubuntu-20.04
test: 0 test: 0
before_install: linux_qt5.sh
preset: linux-gcc-debug preset: linux-gcc-debug
- platform: mac-intel - platform: mac-intel
os: macos-13 os: macos-13
@ -38,6 +41,7 @@ jobs:
pack: 1 pack: 1
pack_type: Release pack_type: Release
extension: dmg extension: dmg
before_install: macos.sh
preset: macos-conan-ninja-release preset: macos-conan-ninja-release
conan_profile: macos-intel conan_profile: macos-intel
conan_prebuilts: dependencies-mac-intel conan_prebuilts: dependencies-mac-intel
@ -49,6 +53,7 @@ jobs:
pack: 1 pack: 1
pack_type: Release pack_type: Release
extension: dmg extension: dmg
before_install: macos.sh
preset: macos-arm-conan-ninja-release preset: macos-arm-conan-ninja-release
conan_profile: macos-arm conan_profile: macos-arm
conan_prebuilts: dependencies-mac-arm conan_prebuilts: dependencies-mac-arm
@ -60,6 +65,7 @@ jobs:
pack: 1 pack: 1
pack_type: Release pack_type: Release
extension: ipa extension: ipa
before_install: macos.sh
preset: ios-release-conan-ccache preset: ios-release-conan-ccache
conan_profile: ios-arm64 conan_profile: ios-arm64
conan_prebuilts: dependencies-ios conan_prebuilts: dependencies-ios
@ -70,6 +76,7 @@ jobs:
pack: 1 pack: 1
pack_type: RelWithDebInfo pack_type: RelWithDebInfo
extension: exe extension: exe
before_install: msvc.sh
preset: windows-msvc-release preset: windows-msvc-release
- platform: mingw - platform: mingw
os: ubuntu-24.04 os: ubuntu-24.04
@ -79,6 +86,7 @@ jobs:
extension: exe extension: exe
cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis` cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
cmake_args: -G Ninja cmake_args: -G Ninja
before_install: mingw_x86_64.sh
preset: windows-mingw-conan-linux preset: windows-mingw-conan-linux
conan_profile: mingw64-linux.jinja conan_profile: mingw64-linux.jinja
conan_prebuilts: dependencies-mingw conan_prebuilts: dependencies-mingw
@ -90,6 +98,7 @@ jobs:
extension: exe extension: exe
cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis` cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
cmake_args: -G Ninja cmake_args: -G Ninja
before_install: mingw_x86.sh
preset: windows-mingw-conan-linux preset: windows-mingw-conan-linux
conan_profile: mingw32-linux.jinja conan_profile: mingw32-linux.jinja
conan_prebuilts: dependencies-mingw-32 conan_prebuilts: dependencies-mingw-32
@ -121,7 +130,8 @@ jobs:
submodules: recursive submodules: recursive
- name: Prepare CI - name: Prepare CI
run: source '${{github.workspace}}/CI/${{matrix.platform}}/before_install.sh' if: "${{ matrix.before_install != '' }}"
run: source '${{github.workspace}}/CI/before_install/${{matrix.before_install}}'
env: env:
VCMI_BUILD_PLATFORM: x64 VCMI_BUILD_PLATFORM: x64

View File

@ -1,4 +0,0 @@
#!/usr/bin/env bash
DEPS_FILENAME=dependencies-android-32
. CI/android/before_install.sh

View File

@ -1,4 +0,0 @@
#!/usr/bin/env bash
DEPS_FILENAME=dependencies-android-64
. CI/android/before_install.sh

View File

@ -1,5 +0,0 @@
#!/usr/bin/env bash
echo "ANDROID_NDK_ROOT=$ANDROID_HOME/ndk/25.2.9519653" >> $GITHUB_ENV
brew install ninja

View File

@ -0,0 +1,4 @@
#!/bin/sh
sudo apt-get update
sudo apt-get install ninja-build

View File

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
sudo apt remove needrestart
sudo apt-get update sudo apt-get update
# Dependencies # Dependencies
@ -9,6 +8,6 @@ sudo apt-get update
# - debian build settings at debian/control # - debian build settings at debian/control
sudo apt-get install libboost-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-locale-dev libboost-iostreams-dev \ sudo apt-get install libboost-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-locale-dev libboost-iostreams-dev \
libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev \ libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev \
qtbase5-dev \ qtbase5-dev qttools5-dev \
ninja-build zlib1g-dev libavformat-dev libswscale-dev libtbb-dev libluajit-5.1-dev \ ninja-build zlib1g-dev libavformat-dev libswscale-dev libtbb-dev libluajit-5.1-dev \
libminizip-dev libfuzzylite-dev qttools5-dev libsqlite3-dev # Optional dependencies libminizip-dev libfuzzylite-dev libsqlite3-dev # Optional dependencies

View File

@ -1,9 +1,11 @@
#!/bin/sh #!/bin/sh
sudo apt remove needrestart
sudo apt-get update sudo apt-get update
# Dependencies # Dependencies
# In case of change in dependencies list please also update:
# - developer docs at docs/developer/Building_Linux.md
# - debian build settings at debian/control
sudo apt-get install libboost-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-locale-dev libboost-iostreams-dev \ sudo apt-get install libboost-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-locale-dev libboost-iostreams-dev \
libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev \ libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev \
qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools \ qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools \

View File

View File

@ -1 +0,0 @@
#!/bin/sh

View File

@ -1 +0,0 @@
#!/bin/sh

View File

@ -1,3 +0,0 @@
#!/usr/bin/env bash
. CI/mac/before_install.sh

View File

@ -1,3 +0,0 @@
#!/usr/bin/env bash
. CI/mac/before_install.sh

View File

@ -1,5 +0,0 @@
#!/usr/bin/env bash
echo DEVELOPER_DIR=/Applications/Xcode_14.2.app >> $GITHUB_ENV
brew install ninja