diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-07-11 09:23:59 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-07-11 09:23:59 +0200 |
commit | 776d46aacbc9317cb05c0d45949b4e4a2d45d848 (patch) | |
tree | 5ef3bfb77974917b7bbe47d50045f6b0f4768362 /.github/workflows | |
parent | Merge remote-tracking branch 'upstream/lcs' into lcs (diff) | |
parent | Merge remote-tracking branch 'origin/miami' into lcs (diff) | |
download | re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.gz re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.bz2 re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.lz re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.xz re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.tar.zst re3-776d46aacbc9317cb05c0d45949b4e4a2d45d848.zip |
Diffstat (limited to '.github/workflows')
-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@ |