.github: drop sudo for prerequisites builds
Files aren't being installed into privileged directories as part of the build but instead into $X11_PREFIX which resides in current user's home directory. Change the cache key to avoid reusing old cache entries, which would lead to permission errors. Signed-off-by: Mike Gelfand <mikedld@mikedld.com>
This commit is contained in:
parent
705d1ce679
commit
bc8518f8f8
|
@ -42,11 +42,11 @@ jobs:
|
||||||
${{ env.X11_PREFIX }}
|
${{ env.X11_PREFIX }}
|
||||||
${{ env.X11_BUILD_DIR }}/xts
|
${{ env.X11_BUILD_DIR }}/xts
|
||||||
${{ env.X11_BUILD_DIR }}/piglit
|
${{ env.X11_BUILD_DIR }}/piglit
|
||||||
key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
||||||
restore-keys: ${{ runner.os }}-x11-deps-
|
restore-keys: ${{ runner.name }}-x11-deps-
|
||||||
|
|
||||||
- name: generic prereq
|
- name: generic prereq
|
||||||
run: sudo .github/scripts/install-prereq.sh
|
run: .github/scripts/install-prereq.sh
|
||||||
|
|
||||||
- name: build
|
- name: build
|
||||||
run: .gitlab-ci/meson-build.sh
|
run: .gitlab-ci/meson-build.sh
|
||||||
|
@ -101,11 +101,11 @@ jobs:
|
||||||
${{ env.X11_PREFIX }}
|
${{ env.X11_PREFIX }}
|
||||||
${{ env.X11_BUILD_DIR }}/xts
|
${{ env.X11_BUILD_DIR }}/xts
|
||||||
${{ env.X11_BUILD_DIR }}/piglit
|
${{ env.X11_BUILD_DIR }}/piglit
|
||||||
key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
||||||
restore-keys: ${{ runner.os }}-x11-deps-
|
restore-keys: ${{ runner.name }}-x11-deps-
|
||||||
|
|
||||||
- name: generic prereq
|
- name: generic prereq
|
||||||
run: sudo .github/scripts/install-prereq.sh
|
run: .github/scripts/install-prereq.sh
|
||||||
|
|
||||||
- name: build xserver sdk
|
- name: build xserver sdk
|
||||||
run: |
|
run: |
|
||||||
|
|
Loading…
Reference in New Issue