lint: Flatten lint image entry points
This commit is contained in:
5 files changed
+8
-23
No files matched your search
@@ -73,6 +73,7 @@ def main():
|
|||||||
*get_worktree_mounts(repo_root),
|
*get_worktree_mounts(repo_root),
|
||||||
*([] if is_ci else ["-it"]),
|
*([] if is_ci else ["-it"]),
|
||||||
container,
|
container,
|
||||||
|
"./ci/lint/06_script.sh",
|
||||||
*sys.argv[1:],
|
*sys.argv[1:],
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ export LC_ALL=C
|
|||||||
|
|
||||||
set -o errexit -o pipefail -o xtrace
|
set -o errexit -o pipefail -o xtrace
|
||||||
|
|
||||||
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
export CI_RETRY_EXE="/ci_retry"
|
export CI_RETRY_EXE="/ci_retry"
|
||||||
|
|
||||||
pushd "/"
|
pushd "/"
|
||||||
|
|||||||
@@ -8,6 +8,12 @@ export LC_ALL=C
|
|||||||
|
|
||||||
set -o errexit -o pipefail -o xtrace
|
set -o errexit -o pipefail -o xtrace
|
||||||
|
|
||||||
|
# Fixes permission issues when there is a container UID/GID mismatch with the owner
|
||||||
|
# of the mounted bitcoin src dir.
|
||||||
|
git config --global --add safe.directory /bitcoin
|
||||||
|
|
||||||
|
export PATH="/python_build/bin:${PATH}"
|
||||||
|
|
||||||
if [ -n "${LINT_CI_IS_PR}" ]; then
|
if [ -n "${LINT_CI_IS_PR}" ]; then
|
||||||
export COMMIT_RANGE="HEAD~..HEAD"
|
export COMMIT_RANGE="HEAD~..HEAD"
|
||||||
if [ "$(git rev-list -1 HEAD)" != "$(git rev-list -1 --merges HEAD)" ]; then
|
if [ "$(git rev-list -1 HEAD)" != "$(git rev-list -1 --merges HEAD)" ]; then
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
#
|
|
||||||
# Copyright (c) The Bitcoin Core developers
|
|
||||||
# Distributed under the MIT software license, see the accompanying
|
|
||||||
# file COPYING or https://opensource.org/license/mit/.
|
|
||||||
|
|
||||||
export LC_ALL=C
|
|
||||||
|
|
||||||
# Fixes permission issues when there is a container UID/GID mismatch with the owner
|
|
||||||
# of the mounted bitcoin src dir.
|
|
||||||
git config --global --add safe.directory /bitcoin
|
|
||||||
|
|
||||||
export PATH="/python_build/bin:${PATH}"
|
|
||||||
|
|
||||||
./ci/lint/06_script.sh "$@"
|
|
||||||
@@ -6,19 +6,11 @@
|
|||||||
|
|
||||||
FROM mirror.gcr.io/ubuntu:24.04
|
FROM mirror.gcr.io/ubuntu:24.04
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
ENV LC_ALL=C.UTF-8
|
|
||||||
|
|
||||||
COPY ./ci/retry/retry /ci_retry
|
COPY ./ci/retry/retry /ci_retry
|
||||||
COPY ./.python-version /.python-version
|
COPY ./.python-version /.python-version
|
||||||
COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh
|
|
||||||
COPY ./ci/lint/01_install.sh /install.sh
|
COPY ./ci/lint/01_install.sh /install.sh
|
||||||
|
|
||||||
RUN /install.sh && \
|
RUN /install.sh && \
|
||||||
echo 'alias lint="./ci/lint/06_script.sh"' >> ~/.bashrc && \
|
|
||||||
chmod 755 /entrypoint.sh && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
||||||
WORKDIR /bitcoin
|
WORKDIR /bitcoin
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
|
||||||
Reference in new issue
Block a user