Skip to content

Commit

Permalink
Switch to Debian 12 to build packages.
Browse files Browse the repository at this point in the history
The latest cryptography 1.41.1 requires a version of rustc which is not
available on Debian 11

Signed-off-by: Pedro Algarvio <[email protected]>
  • Loading branch information
s0undt3ch committed Jul 5, 2023
1 parent 1d7d51f commit f5df0a8
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .github/actions/setup-python-tools-scripts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ runs:
shell: bash
working-directory: ${{ inputs.cwd }}
run: |
python3 -m pip install -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
(python3 -m pip install --help | grep break-system-packages > /dev/null 2>&1) && exitcode=0 || exitcode=1
if [ $exitcode -eq 0 ]; then
python3 -m pip install --break-system-packages -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
else
python3 -m pip install -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
fi
- name: Get 'python-tools-scripts' Version
id: get-version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-deb-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- src

container:
image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-11
image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12

steps:
# Checkout here so we can easily use custom actions
Expand Down
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,17 @@ repos:
- --py-version=3.10
- --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
- requirements/static/ci/tools.in

- id: pip-tools-compile
alias: compile-ci-tools-3.11-requirements
name: Linux CI Py3.11 Tools Requirements
files: ^requirements/static/ci/(tools\.in|py3.11/(tools|linux)\.txt)$
pass_filenames: false
args:
- -v
- --py-version=3.11
- --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
- requirements/static/ci/tools.in
# <---- Tools -----------------------------------------------------------------------------------------------------

# ----- Code Formatting ------------------------------------------------------------------------------------------->
Expand Down
58 changes: 58 additions & 0 deletions requirements/static/ci/py3.11/tools.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements/static/ci/py3.11/tools.txt --pip-args='--constraint=requirements/static/ci/py3.11/linux.txt' requirements/static/ci/tools.in
#
attrs==22.1.0
# via
# -r requirements/static/ci/tools.in
# python-tools-scripts
boto3==1.21.46
# via -r requirements/static/ci/tools.in
botocore==1.24.46
# via
# boto3
# s3transfer
certifi==2022.12.7
# via requests
charset-normalizer==3.0.1
# via requests
commonmark==0.9.1
# via rich
idna==3.4
# via requests
jinja2==3.1.2
# via -r requirements/static/ci/tools.in
jmespath==1.0.1
# via
# boto3
# botocore
markupsafe==2.1.2
# via jinja2
packaging==23.0
# via -r requirements/static/ci/tools.in
pygments==2.13.0
# via rich
python-dateutil==2.8.2
# via botocore
python-tools-scripts==0.12.0
# via -r requirements/static/ci/tools.in
pyyaml==6.0
# via -r requirements/static/ci/tools.in
requests==2.31.0
# via
# python-tools-scripts
# virustotal3
rich==12.5.1
# via python-tools-scripts
s3transfer==0.5.2
# via boto3
six==1.16.0
# via python-dateutil
urllib3==1.26.12
# via
# botocore
# requests
virustotal3==1.0.8
# via -r requirements/static/ci/tools.in

0 comments on commit f5df0a8

Please sign in to comment.