Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/lib/poseidon_api/idna-3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
cglewis authored Jun 4, 2024
2 parents f51652d + 47d40c7 commit 8c2d3c7
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
cd lib/poseidon_core && poetry run pip install 'setuptools==64.0.3' && poetry run pytest --cov-report term-missing --cov=. --cov-report=xml && cd ../../
- name: Upload coverage
uses: codecov/codecov-action@v4
if: github.repository == 'faucetsdn/poseidon' && github.event_name == 'push'
if: github.repository == 'faucetsdn/poseidon' && github.ref_name == 'main'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: /home/runner/work/poseidon/poseidon/lib/poseidon_api/coverage.xml,/home/runner/work/poseidon/poseidon/lib/poseidon_cli/coverage.xml,/home/runner/work/poseidon/poseidon/lib/poseidon_core/coverage.xml
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ on:

jobs:
analyze:
permissions:
actions: read
contents: write
security-events: write
name: Analyze
runs-on: ubuntu-latest

Expand All @@ -35,11 +39,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -50,7 +54,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -64,4 +68,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions lib/poseidon_api/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions lib/poseidon_cli/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions lib/poseidon_core/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/poseidon_core/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ prometheus_client = "^0.17.0"
pyyaml = "6.0"
schedule = "1.2.0"
transitions = "0.9.0"
requests = "<2.31.1"
requests = "<2.32.3"
urllib3 = "<2.0.8"

[tool.poetry.dev-dependencies]
Expand Down

0 comments on commit 8c2d3c7

Please sign in to comment.