From 4b2494cc676e626831b7f59181065b54c7831326 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Mon, 5 Jul 2021 22:01:46 +0100 Subject: [PATCH 1/2] Replace bintray URLs --- .github/workflows/build-cmake-conan.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml index d30f2c2..c356adf 100644 --- a/.github/workflows/build-cmake-conan.yml +++ b/.github/workflows/build-cmake-conan.yml @@ -36,8 +36,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" if: ${{ matrix.platform == 'ps2' }} shell: python From 4429126df36015396daec62b487ec01b5c48895b Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Mon, 5 Jul 2021 22:18:22 +0100 Subject: [PATCH 2/2] Update .github/workflows/build-cmake-conan.yml Co-authored-by: Anonymous Maarten --- .github/workflows/build-cmake-conan.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml index c356adf..0719f2a 100644 --- a/.github/workflows/build-cmake-conan.yml +++ b/.github/workflows/build-cmake-conan.yml @@ -38,7 +38,6 @@ jobs: conan config set log.print_run_commands=True 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" if: ${{ matrix.platform == 'ps2' }} shell: python