Add CI status badge to the readme, plus a missing dependency

This commit is contained in:
2022-07-07 09:19:51 -04:00
parent b5a1bbf283
commit 4783c24779
3 changed files with 23 additions and 46 deletions

View File

@@ -11,38 +11,6 @@
},
jobs: {
macos-old: {
runs-on: macos-10.14,
env: {
DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
},
steps: [
{
name: checkout,
uses: actions/checkout@v2
},
{
name: install Boost,
run: brew install Boost
},
{
name: install SFML,
run: ./.github/workflows/scripts/mac/install-sfml.sh
},
{
name: patch Xcode project,
run: ./.github/workflows/scripts/mac/fix-xcode-proj.sh
},
{
name: build,
run: ./.github/workflows/scripts/mac/xcode-build.sh
},
{
name: unit tests,
run: ./.github/workflows/scripts/mac/run-tests.sh
}
]
},
macos-xcode: {
runs-on: macos-10.15,
env: {
@@ -51,7 +19,8 @@
steps: [
{
name: checkout,
uses: actions/checkout@v2
uses: actions/checkout@v2,
with: { submodules: true }
},
{
name: install Boost,
@@ -80,7 +49,8 @@
# steps: [
# {
# name: checkout,
# uses: actions/checkout@v2
# uses: actions/checkout@v2,
# with: { submodules: true }
# },
# {
# name: install dependencies,
@@ -92,12 +62,13 @@
# }
# ]
# },
win-old: {
runs-on: windows-2016,
win-vs32: {
runs-on: windows-2019,
steps: [
{
name: checkout,
uses: actions/checkout@v2
uses: actions/checkout@v2,
with: { submodules: true }
},
{
name: install dependencies,
@@ -109,12 +80,13 @@
}
]
},
win: {
win-vs64: {
runs-on: windows-2019,
steps: [
{
name: checkout,
uses: actions/checkout@v2
uses: actions/checkout@v2,
with: { submodules: true }
},
{
name: install dependencies,
@@ -135,7 +107,8 @@
steps: [
{
name: checkout,
uses: actions/checkout@v2
uses: actions/checkout@v2,
with: { submodules: true }
},
{
name: install build dependencies,
@@ -156,7 +129,8 @@
# steps: [
# {
# name: checkout,
# uses: actions/checkout@v2
# uses: actions/checkout@v2,
# with: { submodules: true }
# },
# {
# name: install build dependencies,
@@ -177,7 +151,8 @@
steps: [
{
name: checkout,
uses: actions/checkout@v2
uses: actions/checkout@v2,
with: { submodules: true }
},
{
name: install dependencies,
@@ -194,4 +169,4 @@
],
}
}
}
}

View File

@@ -1,6 +1,6 @@
#!/bin/sh -ve
git clone --depth 1 -b 0.8 https://github.com/texus/TGUI.git
git clone --depth 1 -b 0.9 https://github.com/texus/TGUI.git
cd TGUI
export CLICOLOR_FORCE=1
cmake .

View File

@@ -1,3 +1,5 @@
[![CI status](https://github.com/calref/cboe/actions/workflows/ci.yml/badge.svg)](https://github.com/calref/cboe/actions/workflows/ci.yml?query=branch%3Aci)
Classic Blades of Exile
=======================
@@ -67,11 +69,11 @@ If you are using Visual Studio, we recommend installing [vcpkg](https://github.c
Use the following commands to install the required dependencies:
For 32-bit builds:
vcpkg install zlib:x86-windows sfml:x86-windows opengl:x86-windows boost-any:x86-windows boost-dynamic-bitset:x86-windows boost-ptr-container:x86-windows boost-core:x86-windows boost-filesystem:x86-windows boost-system:x86-windows boost-date-time:x86-windows boost-chrono:x86-windows
vcpkg install zlib:x86-windows sfml:x86-windows opengl:x86-windows boost-any:x86-windows boost-dynamic-bitset:x86-windows boost-ptr-container:x86-windows boost-core:x86-windows boost-filesystem:x86-windows boost-system:x86-windows boost-date-time:x86-windows boost-chrono:x86-windows boost-math:x86-windows
For 64-bit builds (Not supported in Visual Studio projects, yet):
vcpkg install zlib:x64-windows sfml:x64-windows opengl:x64-windows boost-any:x64-windows boost-dynamic-bitset:x64-windows boost-ptr-container:x64-windows boost-core:x64-windows boost-filesystem:x64-windows boost-system:x64-windows boost-date-time:x64-windows boost-chrono:x64-windows
vcpkg install zlib:x64-windows sfml:x64-windows opengl:x64-windows boost-any:x64-windows boost-dynamic-bitset:x64-windows boost-ptr-container:x64-windows boost-core:x64-windows boost-filesystem:x64-windows boost-system:x64-windows boost-date-time:x64-windows boost-chrono:x64-windows boost-math:x64-windows
If this is the first time installing packages with vcpkg since install you will need to run the `integrate` command: