Skip to content

Commit 7967814

Browse files
authored
⚙️ Fix CI (#135)
<!-- Copyright (C) 2020-2025 Arm Limited or its affiliates and Contributors. All rights reserved. SPDX-License-Identifier: Apache-2.0 --> ### Description - Changes so that CI passes again ### Test Coverage <!-- Please put an `x` in the correct box e.g. `[x]` to indicate the testing coverage of this change. --> - [x] This change is covered by existing or additional automated tests. - [ ] Manual testing has been performed (and evidence provided) as automated testing was not feasible. - [ ] Additional tests are not required for this change (e.g. documentation update).
1 parent e7c4361 commit 7967814

47 files changed

Lines changed: 534 additions & 491 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install CI/CD tools
3636
run: |
3737
python -m pip install --upgrade pip
38-
python -m pip install continuous-delivery-scripts
38+
python -m pip install setuptools continuous-delivery-scripts
3939
python -m pip list
4040
- name: Assert news
4141
run: cd-assert-news -b ${CI_ACTION_REF_NAME}
@@ -123,6 +123,7 @@ jobs:
123123
# location for development dependencies.
124124
run: |
125125
python -m pip install -r dev-requirements.txt
126+
python -m pip install setuptools
126127
python -m pip list
127128
- name: Generate SPDX documents
128129
run: |
@@ -146,7 +147,7 @@ jobs:
146147
- name: Install tools
147148
run: |
148149
python -m pip install --upgrade pip
149-
python -m pip install detect-secrets==1.0.3
150+
python -m pip install setuptools detect-secrets[gibberish]==1.5.0
150151
python -m pip list
151152
- uses: actions/checkout@v5
152153
with:
@@ -246,7 +247,7 @@ jobs:
246247
# is superfluous and eliminating pipenv in CI reduces overhead and reduce complexity, while retaining a single
247248
# location for development dependencies.
248249
run: |
249-
pip install --upgrade flake8
250+
pip install --upgrade flake8 setuptools
250251
pip install -r dev-requirements.txt
251252
pip list
252253
- if: ${{ startsWith(matrix.python-version, '3.10') }}

.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install CI/CD tools
2020
run: |
2121
python -m pip install --upgrade pip
22-
python -m pip install continuous-delivery-scripts
22+
python -m pip install setuptools continuous-delivery-scripts
2323
python -m pip list
2424
- name: Dependabot metadata
2525
id: dependabot-metadata

.github/workflows/mypy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Install pipenv
2020
shell: bash
2121
run: |
22-
python -m pip install --upgrade pipenv
22+
python -m pip install --upgrade pipenv setuptools
2323
pipenv install --dev
2424
- name: Type check with mypy
2525
run: |
26-
pipenv run mypy ./continuous_delivery_scripts
26+
pipenv run mypy ./continuous_delivery_scripts

.gitignore

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

44
# PyCharm
5-
.idea/
5+
.idea
66

77
# macOS
88
.DS_Store

0 commit comments

Comments
 (0)