Skip to content

Commit faeb40b

Browse files
author
MarcoFalke
committed
ci: Install missing lint packages
Also merge script into ci/lint_run_all.sh because env vars weren't exported properly
1 parent 9b28bd7 commit faeb40b

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.cirrus.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,8 @@ task:
7070
memory: 1G
7171
# For faster CI feedback, immediately schedule the linters
7272
<< : *CREDITS_TEMPLATE
73-
setup_script:
74-
- set -o errexit; source ./ci/test/00_setup_env.sh
75-
install_script:
76-
- set -o errexit; source ./ci/lint/04_install.sh
77-
before_script:
78-
- set -o errexit; source ./ci/lint/05_before_script.sh
7973
lint_script:
80-
- set -o errexit; source ./ci/lint/06_script.sh
74+
- ./ci/lint_run_all.sh
8175

8276
task:
8377
name: 'ARM [unit tests, no functional tests] [buster]'

ci/lint/04_install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
export LC_ALL=C
88

9-
${CI_RETRY_EXE} apt update && apt install -y clang-format-9 python3-pip curl git
9+
${CI_RETRY_EXE} apt-get update
10+
${CI_RETRY_EXE} apt-get install -y clang-format-9 python3-pip curl git gawk jq
1011
update-alternatives --install /usr/bin/clang-format clang-format $(which clang-format-9 ) 100
1112
update-alternatives --install /usr/bin/clang-format-diff clang-format-diff $(which clang-format-diff-9) 100
1213

ci/lint_run_all.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Copyright (c) 2019 The Bitcoin Core developers
4+
# Distributed under the MIT software license, see the accompanying
5+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
6+
7+
export LC_ALL=C.UTF-8
8+
9+
set -o errexit; source ./ci/test/00_setup_env.sh
10+
set -o errexit; source ./ci/lint/04_install.sh
11+
set -o errexit; source ./ci/lint/05_before_script.sh
12+
set -o errexit; source ./ci/lint/06_script.sh

0 commit comments

Comments
 (0)