summaryrefslogtreecommitdiffstats
path: root/.github/workflows/build-cmake-conan.yml
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-07-05 19:00:34 +0200
committerwithmorten <morten.with@gmail.com>2021-07-05 19:07:47 +0200
commit8916fe1820940ad7a2b5550a53d04efc115e235c (patch)
tree8bfac2394adf0b3c34e173cc04cac16864b72a27 /.github/workflows/build-cmake-conan.yml
parentMerge pull request #1202 from AGraber/librw_update (diff)
downloadre3-8916fe1820940ad7a2b5550a53d04efc115e235c.tar
re3-8916fe1820940ad7a2b5550a53d04efc115e235c.tar.gz
re3-8916fe1820940ad7a2b5550a53d04efc115e235c.tar.bz2
re3-8916fe1820940ad7a2b5550a53d04efc115e235c.tar.lz
re3-8916fe1820940ad7a2b5550a53d04efc115e235c.tar.xz
re3-8916fe1820940ad7a2b5550a53d04efc115e235c.tar.zst
re3-8916fe1820940ad7a2b5550a53d04efc115e235c.zip
Diffstat (limited to '')
-rw-r--r--.github/workflows/build-cmake-conan.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml
index 6a3d9c87..5e8dad94 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: |