mirror of
https://github.com/alterware/master-server.git
synced 2026-02-02 11:23:03 +00:00
Merge pull request #132 from alterware/ci/update-premake5
chore: update Premake5
This commit is contained in:
34
.github/actions/configure-gcc/action.yml
vendored
Normal file
34
.github/actions/configure-gcc/action.yml
vendored
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
name: "Configure gcc"
|
||||||
|
description: "Installs and configures gcc in a specific version on an ubuntu image"
|
||||||
|
inputs:
|
||||||
|
gcc_version:
|
||||||
|
description: "The version of gcc to install. Must be the major version only."
|
||||||
|
required: true
|
||||||
|
enable_x86:
|
||||||
|
description: "Whether to enable x86 support."
|
||||||
|
default: "false"
|
||||||
|
runs:
|
||||||
|
using: "composite"
|
||||||
|
steps:
|
||||||
|
- name: Install g++ and multilib
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y gcc-${{ inputs.gcc_version }} g++-${{ inputs.gcc_version }} ${ADDITIONAL_PACKAGES}
|
||||||
|
env:
|
||||||
|
ADDITIONAL_PACKAGES: ${{ case(inputs.enable_x86 == 'true', format('gcc-{0}-multilib g++-{0}-multilib', inputs.gcc_version), '') }}
|
||||||
|
|
||||||
|
- name: Configure gcc
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
function register_gcc_version {
|
||||||
|
local version=$1
|
||||||
|
local priority=$2
|
||||||
|
|
||||||
|
update-alternatives \
|
||||||
|
--verbose \
|
||||||
|
--install /usr/bin/gcc gcc /usr/bin/gcc-${version} ${priority} \
|
||||||
|
--slave /usr/bin/g++ g++ /usr/bin/g++-${version}
|
||||||
|
}
|
||||||
|
|
||||||
|
register_gcc_version ${{ inputs.gcc_version }} 100
|
||||||
26
.github/workflows/build.yml
vendored
26
.github/workflows/build.yml
vendored
@@ -16,7 +16,7 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
env:
|
env:
|
||||||
PREMAKE_VERSION: "5.0.0-beta7"
|
PREMAKE_VERSION: "5.0.0-beta8"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-windows:
|
build-windows:
|
||||||
@@ -89,17 +89,16 @@ jobs:
|
|||||||
configuration:
|
configuration:
|
||||||
- release
|
- release
|
||||||
arch:
|
arch:
|
||||||
- x86
|
|
||||||
- amd64
|
- amd64
|
||||||
steps:
|
steps:
|
||||||
- name: Install g++ and multilib
|
- name: Enable i386 architecture
|
||||||
|
if: ${{ matrix.build_arch == 'x86' }}
|
||||||
|
run: dpkg --add-architecture i386
|
||||||
|
|
||||||
|
- name: Install base packages
|
||||||
run: |
|
run: |
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y wget tar git make gcc-13 g++-13 gcc-13-multilib g++-13-multilib
|
apt-get install -y wget tar git make curl
|
||||||
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
|
|
||||||
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
|
|
||||||
update-alternatives --set gcc /usr/bin/gcc-13
|
|
||||||
update-alternatives --set g++ /usr/bin/g++-13
|
|
||||||
|
|
||||||
- name: Check out files
|
- name: Check out files
|
||||||
uses: actions/checkout@main
|
uses: actions/checkout@main
|
||||||
@@ -108,12 +107,11 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
lfs: false
|
lfs: false
|
||||||
|
|
||||||
- name: Install dependencies (x86)
|
- name: Configure gcc
|
||||||
if: matrix.arch == 'x86'
|
uses: ./.github/actions/configure-gcc
|
||||||
run: |
|
with:
|
||||||
dpkg --add-architecture i386
|
gcc_version: 14
|
||||||
apt-get update
|
enable_x86: ${{ case(matrix.build_arch == 'x86', 'true', 'false') }}
|
||||||
apt-get install -y gcc-13-multilib g++-13-multilib
|
|
||||||
|
|
||||||
- name: Install Premake5
|
- name: Install Premake5
|
||||||
uses: diamante0018/setup-premake@master
|
uses: diamante0018/setup-premake@master
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ if os.getenv("CI") then
|
|||||||
defines "CI"
|
defines "CI"
|
||||||
end
|
end
|
||||||
|
|
||||||
flags {"NoIncrementalLink", "NoMinimalRebuild", "MultiProcessorCompile", "No64BitChecks"}
|
multiprocessorcompile "On"
|
||||||
|
|
||||||
filter "configurations:release"
|
filter "configurations:release"
|
||||||
optimize "Size"
|
optimize "Size"
|
||||||
|
|||||||
Reference in New Issue
Block a user