Skip to content

Commit

Permalink
Merge pull request #29 from rohanpm/ci-apt-get-fix
Browse files Browse the repository at this point in the history
Various CI fixes for 2023-11
  • Loading branch information
rohanpm authored Nov 14, 2023
2 parents 970a80f + e01f607 commit 302e795
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:

- name: Install dependencies
run: |
sudo apt-get -y update
sudo apt-get install -y krb5-config libkrb5-dev
python -m pip install -U pip
pip install tox
Expand All @@ -36,8 +37,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install RPM
run: sudo apt-get install -y rpm libkrb5-dev
- name: Install OS packages
run: |
sudo apt-get -y update
sudo apt-get install -y rpm libkrb5-dev
- name: Setup Python
uses: actions/setup-python@v2
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install system dependencies
run: sudo apt-get install -y libkrb5-dev
- name: Install OS packages
run: |
sudo apt-get -y update
sudo apt-get install -y libkrb5-dev
- name: Install Tox
run: pip install tox
- name: Run Tox
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repos:
- repo: https://github.com/ambv/black
rev: 22.3.0
rev: 23.11.0
hooks:
- id: black
language_version: python3.8
- repo: https://github.com/pycqa/isort/
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
language_version: python3.8
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ allowlist_externals=sh

[testenv:static]
commands=
mypy --install-types --non-interactive -p pubtools -p tests
sh -c 'pylint pubtools; test $(( $? & (1|2|4|32) )) = 0'
black --check .
isort --check .
Expand Down

0 comments on commit 302e795

Please sign in to comment.