diff options
| author | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2022-05-31 18:29:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-31 18:29:36 +0200 |
| commit | 612a9317b0720ee8c67556bb6b489234d6076643 (patch) | |
| tree | e2b941fa2c569574d84de285e34acdc875a8293f /travis | |
| parent | dba30fc9879b42e6b89773c81e1067daa2bb6e23 (diff) | |
| download | i3-612a9317b0720ee8c67556bb6b489234d6076643.tar.gz i3-612a9317b0720ee8c67556bb6b489234d6076643.zip | |
GitHub Actions: declare /usr/src/i3 as safe directory (#4992)
Diffstat (limited to 'travis')
| -rw-r--r-- | travis/travis-base-386.Dockerfile | 5 | ||||
| -rw-r--r-- | travis/travis-base-ubuntu-386.Dockerfile | 5 | ||||
| -rw-r--r-- | travis/travis-base-ubuntu.Dockerfile | 5 | ||||
| -rw-r--r-- | travis/travis-base.Dockerfile | 5 |
4 files changed, 20 insertions, 0 deletions
diff --git a/travis/travis-base-386.Dockerfile b/travis/travis-base-386.Dockerfile index fab1a48f..8996e029 100644 --- a/travis/travis-base-386.Dockerfile +++ b/travis/travis-base-386.Dockerfile @@ -26,3 +26,8 @@ COPY debian/control /usr/src/i3-debian-packaging/control RUN linux32 apt-get update && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ rm -rf /var/lib/apt/lists/* + +# The user outside of Docker (GitHub Actions CI runner) and inside of Docker +# (root) are different, and newer versions of git error out in that scenario. +# To fix this, explicitly configure /usr/src/i3 as a safe directory: +RUN git config --global --add safe.directory /usr/src/i3 diff --git a/travis/travis-base-ubuntu-386.Dockerfile b/travis/travis-base-ubuntu-386.Dockerfile index a66d58a2..4a41fe3e 100644 --- a/travis/travis-base-ubuntu-386.Dockerfile +++ b/travis/travis-base-ubuntu-386.Dockerfile @@ -26,3 +26,8 @@ COPY debian/control /usr/src/i3-debian-packaging/control RUN linux32 apt-get update && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ rm -rf /var/lib/apt/lists/* + +# The user outside of Docker (GitHub Actions CI runner) and inside of Docker +# (root) are different, and newer versions of git error out in that scenario. +# To fix this, explicitly configure /usr/src/i3 as a safe directory: +RUN git config --global --add safe.directory /usr/src/i3 diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile index 9ee9d355..8523b92c 100644 --- a/travis/travis-base-ubuntu.Dockerfile +++ b/travis/travis-base-ubuntu.Dockerfile @@ -27,3 +27,8 @@ COPY debian/control /usr/src/i3-debian-packaging/control RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ rm -rf /var/lib/apt/lists/* + +# The user outside of Docker (GitHub Actions CI runner) and inside of Docker +# (root) are different, and newer versions of git error out in that scenario. +# To fix this, explicitly configure /usr/src/i3 as a safe directory: +RUN git config --global --add safe.directory /usr/src/i3 diff --git a/travis/travis-base.Dockerfile b/travis/travis-base.Dockerfile index da5531ff..52ae0656 100644 --- a/travis/travis-base.Dockerfile +++ b/travis/travis-base.Dockerfile @@ -27,3 +27,8 @@ COPY debian/changelog /usr/src/i3-debian-packaging/changelog RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ rm -rf /var/lib/apt/lists/* + +# The user outside of Docker (GitHub Actions CI runner) and inside of Docker +# (root) are different, and newer versions of git error out in that scenario. +# To fix this, explicitly configure /usr/src/i3 as a safe directory: +RUN git config --global --add safe.directory /usr/src/i3 |