Skip to content

Commit 5c7420e

Browse files
committed
Fix CI scripts
1 parent 2b9e0f6 commit 5c7420e

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

.circleci/config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ executors:
2121
# https://circleci.com/developer/images?imageType=machine
2222
image: windows-server-2022-gui:2024.12.1
2323
shell: bash.exe
24+
# https://circleci.com/docs/using-windows/#available-resource-classes
25+
# https://circleci.com/pricing/#comparison-table
2426
resource_class: windows.large
2527

2628
orbs:
27-
codecov: codecov/codecov@4.0.1
29+
codecov: codecov/codecov@5.3.0
2830

2931
jobs:
3032
"general checks":
@@ -221,7 +223,7 @@ jobs:
221223
- run: pip3 install tox
222224
- run: tox -e coverage-combine
223225
- codecov/upload:
224-
file: coverage.xml
226+
flags: "-f coverage.xml"
225227

226228
"dry run releases":
227229
executor: ubuntu_executor

blogs/docker-ci-tricks-2/blog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ cp .env-sample .env # and optionally edit if needed to change git/python versio
130130
```shell script
131131
# ... skipped ...
132132

133-
source ../local-run-commons.sh tox
133+
source ../local-run-commons.sh
134134

135135
export_directory_hash tox
136136
cd "$(git rev-parse --show-toplevel)"/ci/tox/

ci/aur/local-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e -o pipefail -u -x
44

5-
source "$(git rev-parse --show-toplevel)"/ci/local-run-commons.sh aur
5+
source "$(git rev-parse --show-toplevel)"/ci/local-run-commons.sh
66

77
export_directory_hash aur
88
cd "$(git rev-parse --show-toplevel)"/ci/aur/

ci/nixpkgs-build/local-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e -o pipefail -u -x
44

5-
source "$(git rev-parse --show-toplevel)"/ci/local-run-commons.sh nixpkgs-build
5+
source "$(git rev-parse --show-toplevel)"/ci/local-run-commons.sh
66

77
export_directory_hash nixpkgs-build
88
cd "$(git rev-parse --show-toplevel)"/ci/nixpkgs-build/

ci/tox/local-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e -o pipefail -u
44

5-
source "$(git rev-parse --show-toplevel)"/ci/local-run-commons.sh tox
5+
source "$(git rev-parse --show-toplevel)"/ci/local-run-commons.sh
66

77
export_directory_hash tox
88
cd "$(git rev-parse --show-toplevel)"/ci/tox/

git_machete/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ def slurp_file(path: str) -> str:
282282
def is_terminal_fully_fledged() -> bool:
283283
try:
284284
stdout = popen_cmd('tput', 'colors')[1]
285-
number_of_supported_colors = int(stdout)
285+
number_of_supported_colors = int(stdout) # in CI, this line is only covered by tests on macOS
286286
except Exception:
287287
# If we cannot retrieve the number of supported colors, let's defensively assume it's low.
288288
number_of_supported_colors = 8

0 commit comments

Comments
 (0)