Skip to content

Commit dca02a6

Browse files
committed
Map settings into Conan 2 .conan2
In Conan 2 the CONAN_HOME is .conan2 not .conan, this should hopefully allow authenticating against remotes. Also: - pin GitHub Actions in 2 remaining workflows - revert back to gitlab.freedesktop.org for Mesa3D Signed-off-by: Jean-Francois Panisset <[email protected]>
1 parent 5793a61 commit dca02a6

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

.github/workflows/python-sonar.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414
- name: Set up Python
15-
uses: actions/setup-python@v5
15+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
1616
with:
1717
python-version: 3.9
1818
cache: 'pipenv'

.github/workflows/python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121

2222
- name: Set up Python
23-
uses: actions/setup-python@v5
23+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
2424
with:
2525
python-version: 3.9
2626
cache: 'pipenv'

python/aswfdocker/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def _get_conan_vols(self):
197197
conan_base = os.path.join(utils.get_git_top_level(), "packages", "conan")
198198
vols = {
199199
os.path.join(conan_base, "settings"): os.path.join(
200-
constants.CONAN_USER_HOME, ".conan"
200+
constants.CONAN_USER_HOME, ".conan2"
201201
),
202202
os.path.join(conan_base, "data"): os.path.join(
203203
constants.CONAN_USER_HOME, "d"

scripts/common/install_opengl.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ cd /tmp/gldev/EGL-Registry
5555
git checkout 0fa0d37da846998aa838ed2b784a340c28dadff3
5656
cp -r api/EGL api/KHR /usr/local/include
5757
cd /tmp/gldev
58-
#gitlab.freedesktop.org is down
59-
#git clone --branch=mesa-17.3.3 --depth=1 https://gitlab.freedesktop.org/mesa/mesa.git
60-
git clone --branch=mesa-17.3.3 --depth=1 https://github.com/chaotic-cx/mesa-mirror.git
61-
mv /tmp/gldev/mesa-mirror /tmp/gldev/mesa
58+
git clone --branch=mesa-17.3.3 --depth=1 https://gitlab.freedesktop.org/mesa/mesa.git
6259
cd /tmp/gldev/mesa
6360
mkdir -p /usr/local/include/GL
6461
cp include/GL/gl.h include/GL/gl_mangle.h /usr/local/include/GL/

0 commit comments

Comments
 (0)