diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-07-09 00:05:26 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-09 00:05:26 +0300 |
| commit | d781db6c0f669eaccecee246260290aa20f70020 (patch) | |
| tree | fc963b1e8f3c127a49095a127850bfc1cd09111e /.github | |
| parent | 7a1ff3b2ad0ba3b52849d34e8a904b300f3a18c7 (diff) | |
| parent | 72f67809059c732588ac29eedf8a10f9156b27b4 (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# README.md
# premake5.lua
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-cmake-conan.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml index 609e9293..bf9b719f 100644 --- a/.github/workflows/build-cmake-conan.yml +++ b/.github/workflows/build-cmake-conan.yml @@ -27,7 +27,7 @@ jobs: platform: 'gl3' gl3_gfxlib: 'glfw' audio: 'openal' -# - os: 'ubuntu-latest' +# - os: 'ubuntu-18.04' # platform: 'gl3' # gl3_gfxlib: 'sdl2' # audio: 'openal' @@ -63,8 +63,9 @@ jobs: python -m pip install conan conan config init conan config set log.print_run_commands=True - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan - conan remote add madebr_ps2dev https://api.bintray.com/conan/madebr/ps2dev + conan config set general.revisions_enabled=1 + conan remote add bincrafters https://bincrafters.jfrog.io/artifactory/api/conan/public-conan +# conan remote add madebr_ps2dev https://api.bintray.com/conan/madebr/ps2dev - name: "Add os=playstation2 + gcc.version=3.2 to .conan/settings.yml" shell: python run: | @@ -85,7 +86,7 @@ jobs: fi - name: "Export Playstation 2 CMake toolchain conan recipe" run: | - conan export vendor/librw/cmake/ps2toolchain ps2dev-cmaketoolchain/master@ + conan export vendor/librw/cmake/ps2/cmaketoolchain ps2dev-cmaketoolchain/master@ - name: "Export librw conan recipe" run: | conan export vendor/librw librw/master@ |