diff --git a/.github/workflows/conan-pkg.yml b/.github/workflows/conan-pkg.yml index 2da023a..3f4ae9a 100644 --- a/.github/workflows/conan-pkg.yml +++ b/.github/workflows/conan-pkg.yml @@ -12,14 +12,10 @@ jobs: fail-fast: false matrix: config: - - name: Ubuntu 20.04 - os: ubuntu-20.04 - - name: Ubuntu 18.04 - os: ubuntu-18.04 - - name: VS 2017 - os: windows-2016 - - name: VS 2019 - os: windows-2019 + - name: Ubuntu + os: ubuntu-latest + - name: Windows + os: windows-latest name: ${{ matrix.config.name }} steps: @@ -36,6 +32,10 @@ jobs: conan profile new default --detect conan profile update settings.compiler.libcxx=libstdc++11 default + - name: Install DX9 SDK + if: startsWith(matrix.config.os, 'windows') + run: choco install directx-sdk -y + - name: Run env: CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }} diff --git a/build.py b/build.py index 9a2c89d..d26e233 100755 --- a/build.py +++ b/build.py @@ -38,4 +38,4 @@ data = list(filter(lambda k: 'anotherfoxguy' in k, subprocess.run( ['conan', 'search', '*', '--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split())) for d in data: - system(f"conan upload {d} -r ror-v2 --all") \ No newline at end of file + system(f"conan upload {d} -r ror-v2 --all --force") \ No newline at end of file