File tree Expand file tree Collapse file tree 3 files changed +15
-10
lines changed
Expand file tree Collapse file tree 3 files changed +15
-10
lines changed Original file line number Diff line number Diff line change 2424 - name : Install necessary software
2525 run : |
2626 set -e
27- sudo apt update
28- sudo apt -y install tox
27+ sudo apt-get update
28+ sudo apt-get -y install tox
2929 - name : Test formatting with ruff & check the markers
3030 run : ./pre-commit-full.sh
3131
4848
4949 # jo is used only to generate matrix using json easily
5050 - name : Install necessary software
51- run : sudo apt update && sudo apt install jo tox fish
51+ run : sudo apt-get update && sudo apt install jo tox fish
5252
5353 - id : setmatrix
5454 run : |
@@ -102,7 +102,7 @@ jobs:
102102 with :
103103 python-version : " 3.x"
104104 - name : Install tox
105- run : sudo apt update && sudo apt install tox
105+ run : sudo apt-get update && sudo apt-get install tox
106106 - run : tox -e doc
107107
108108 lint :
@@ -114,7 +114,7 @@ jobs:
114114 with :
115115 python-version : " 3.x"
116116 - name : Install tox
117- run : sudo apt update && sudo apt install tox
117+ run : sudo apt-get update && sudo apt-get install tox
118118 - run : tox -e lint
119119
120120 test-containers :
@@ -221,6 +221,8 @@ jobs:
221221 steps :
222222 - name : Clean up disk space to maximize available space
223223 run : sudo rm -rf /usr/local/*/* /usr/local/.ghcup /home/runner/.rustup /home/linuxbrew /usr/share/swift /usr/share/dotnet /opt/google/chrome /opt/microsoft/msedge /opt/ghc /opt/hostedtoolcache && sudo docker image prune --all --force
224+ - name : Uninstall conflicting packages
225+ run : sudo apt-get -y remove python3-chardet
224226 - name : checkout source code
225227 uses : actions/checkout@v6
226228 - name : Set up Python
Original file line number Diff line number Diff line change 6363 "15.7" ,
6464 "15.7-spr" ,
6565 "16.0" ,
66+ "16.1" ,
6667 "tumbleweed" ,
6768)
6869
Original file line number Diff line number Diff line change @@ -424,13 +424,15 @@ def test_no_orphaned_packages(container_per_test: ContainerData) -> None:
424424
425425 # kubic-locale-archive should be replaced by glibc-locale-base in the containers
426426 # but that is a few bytes larger so we accept it as an exception
427+ eula_package = "skelcd-EULA-bci"
428+ if OS_VERSION .startswith ("16.1" ):
429+ eula_package = "skelcd-EULA-SLES"
430+ elif OS_VERSION .startswith ("16" ):
431+ eula_package = "skelcd-EULA-BCI"
432+
427433 known_orphaned_packages = {
434+ eula_package ,
428435 "kubic-locale-archive" ,
429- (
430- "skelcd-EULA-BCI"
431- if OS_VERSION .startswith ("16" )
432- else "skelcd-EULA-bci"
433- ),
434436 "sles-ltss-release" ,
435437 ("SLES-release" if OS_VERSION .startswith ("16" ) else "sles-release" ),
436438 "ALP-dummy-release" ,
You can’t perform that action at this time.
0 commit comments