Skip to content

Commit

Permalink
Merge pull request #443 from pyupio/fix/pin-compatible-packaging-vers…
Browse files Browse the repository at this point in the history
…ions

Pin packaging to a compatible version
  • Loading branch information
yeisonvargasf committed Dec 8, 2022
2 parents f78823c + 93598ae commit b62b75c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Expand Up @@ -9,7 +9,7 @@ env:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main

steps:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Expand Up @@ -4,7 +4,7 @@ on: [ push ]

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11" ]
Expand Down Expand Up @@ -32,7 +32,7 @@ jobs:

strategy:
matrix:
os: ['windows-latest', 'ubuntu-latest', 'macos-latest']
os: ['windows-latest', 'ubuntu-20.04', 'macos-latest']
env:
BINARY_OS: '${{ matrix.os }}'
steps:
Expand Down Expand Up @@ -60,13 +60,13 @@ jobs:
path: dist/safety-win-x86_64.exe
if-no-files-found: error
- uses: actions/upload-artifact@v3
if: ${{ matrix.os == 'ubuntu-latest' }}
if: ${{ matrix.os == 'ubuntu-20.04' }}
with:
name: safety-linux-i686
path: dist/safety-linux-i686
if-no-files-found: error
- uses: actions/upload-artifact@v3
if: ${{ matrix.os == 'ubuntu-latest' }}
if: ${{ matrix.os == 'ubuntu-20.04' }}
with:
name: safety-linux-x86_64
path: dist/safety-linux-x86_64
Expand All @@ -81,7 +81,7 @@ jobs:

deploy-pypi:
needs: build-binaries
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')

Expand All @@ -105,7 +105,7 @@ jobs:

create-gh-release:
needs: deploy-pypi
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
permissions:
contents: write
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-insecure.yml
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -24,7 +24,7 @@ jobs:
# case, to avoid confusion
test-auto-requirements-txt-insecure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand All @@ -49,7 +49,7 @@ jobs:
# Same as above, but for a poetry lock file
test-auto-poetry-insecure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand All @@ -74,7 +74,7 @@ jobs:
# Same as above, but for a Pipfile.lock
test-auto-pipfile-insecure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand All @@ -101,7 +101,7 @@ jobs:
### installs things in the root VM that the action runs on; this is what gets scanned.
test-auto-environment-insecure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
### Scans a recently built Docker container. This uses a few heuristics, defined in entrypoint.sh
test-auto-docker-insecure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-secure.yml
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -25,7 +25,7 @@ jobs:
# case, to avoid confusion
test-auto-requirements-txt-secure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand All @@ -47,7 +47,7 @@ jobs:
# Same as above, but for a poetry lock file
test-auto-poetry-secure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand All @@ -69,7 +69,7 @@ jobs:
# Same as above, but for a Pipfile.lock
test-auto-pipfile-secure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand All @@ -93,7 +93,7 @@ jobs:
### installs things in the root VM that the action runs on; this is what gets scanned.
test-auto-environment-secure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
### Scans a recently built Docker container. This uses a few heuristics, defined in entrypoint.sh
test-auto-docker-secure:
needs: [ matrix ]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
environment: main
strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -39,7 +39,7 @@ install_requires =
setuptools>=19.3
Click>=8.0.2
requests
packaging>=21.0
packaging>=21.0,<22.0
dparse>=0.6.2
ruamel.yaml>=0.17.21
dataclasses==0.8; python_version=="3.6"
Expand Down

0 comments on commit b62b75c

Please sign in to comment.