Skip to content

Vfx2025 conan2 auth #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfpanisset merged 2 commits into from
Apr 21, 2025
Merged

Vfx2025 conan2 auth #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc099e2
Map settings into Conan 2 .conan2
jfpanisset Apr 21, 2025
9c088cc
Set CONAN_HOME to find remotes.json
jfpanisset Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/python-sonar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
with:
python-version: 3.9
cache: 'pipenv'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
with:
python-version: 3.9
cache: 'pipenv'
Expand Down
3 changes: 2 additions & 1 deletion python/aswfdocker/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ def _run_in_docker(self, base_cmd, cmd, dry_run):
def _get_conan_env_vars(self, version_info):
envs = {
"CONAN_USER_HOME": constants.CONAN_USER_HOME,
"CONAN_HOME": os.path.join(constants.CONAN_USER_HOME, ".conan2"),
"CCACHE_DIR": "/tmp/ccache",
"CONAN_NON_INTERACTIVE": "1",
}
Expand All @@ -197,7 +198,7 @@ def _get_conan_vols(self):
conan_base = os.path.join(utils.get_git_top_level(), "packages", "conan")
vols = {
os.path.join(conan_base, "settings"): os.path.join(
constants.CONAN_USER_HOME, ".conan"
constants.CONAN_USER_HOME, ".conan2"
),
os.path.join(conan_base, "data"): os.path.join(
constants.CONAN_USER_HOME, "d"
Expand Down
5 changes: 1 addition & 4 deletions scripts/common/install_opengl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ cd /tmp/gldev/EGL-Registry
git checkout 0fa0d37da846998aa838ed2b784a340c28dadff3
cp -r api/EGL api/KHR /usr/local/include
cd /tmp/gldev
#gitlab.freedesktop.org is down
#git clone --branch=mesa-17.3.3 --depth=1 https://gitlab.freedesktop.org/mesa/mesa.git
git clone --branch=mesa-17.3.3 --depth=1 https://github.com/chaotic-cx/mesa-mirror.git
mv /tmp/gldev/mesa-mirror /tmp/gldev/mesa
git clone --branch=mesa-17.3.3 --depth=1 https://gitlab.freedesktop.org/mesa/mesa.git
cd /tmp/gldev/mesa
mkdir -p /usr/local/include/GL
cp include/GL/gl.h include/GL/gl_mangle.h /usr/local/include/GL/
Expand Down
Loading