AnotherFoxGuy/ror-conan-recipes
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

🐛 Fixed missing dx9 sdk install step

Browse Source
This commit is contained in:
Edgar
2021-09-20 14:34:09 +02:00
parent 44cda183ed
commit 4686ebc64f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/conan-pkg.yml vendored
View File

@@ -12,14 +12,10 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
config: config:
- name: Ubuntu 20.04 - name: Ubuntu
os: ubuntu-20.04 os: ubuntu-latest
- name: Ubuntu 18.04 - name: Windows
os: ubuntu-18.04 os: windows-latest
- name: VS 2017
os: windows-2016
- name: VS 2019
os: windows-2019
name: ${{ matrix.config.name }} name: ${{ matrix.config.name }}
steps: steps:
@@ -36,6 +32,10 @@ jobs:
conan profile new default --detect conan profile new default --detect
conan profile update settings.compiler.libcxx=libstdc++11 default 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 - name: Run
env: env:
CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }} CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }}

2
build.py
View File

@@ -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())) ['conan', 'search', '*', '--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split()))
for d in data: for d in data:
system(f"conan upload {d} -r ror-v2 --all") system(f"conan upload {d} -r ror-v2 --all --force")