diff --git a/.github/workflows/python-sonar.yml b/.github/workflows/python-sonar.yml index b0df1b71..6c7f74f3 100644 --- a/.github/workflows/python-sonar.yml +++ b/.github/workflows/python-sonar.yml @@ -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' diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index df5395a4..047b256f 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -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' diff --git a/python/aswfdocker/builder.py b/python/aswfdocker/builder.py index d48a36b5..9bdd6c80 100644 --- a/python/aswfdocker/builder.py +++ b/python/aswfdocker/builder.py @@ -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", } @@ -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" diff --git a/scripts/common/install_opengl.sh b/scripts/common/install_opengl.sh index a6d58ad7..3e69f3d0 100755 --- a/scripts/common/install_opengl.sh +++ b/scripts/common/install_opengl.sh @@ -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/