Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #3750

Merged
merged 5 commits into from
Jul 22, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
update dependency to resolve some CVEs
  • Loading branch information
yunchu committed Jul 19, 2024

Unverified

This user has not yet uploaded their public signing key.
commit c1e62b316c221377804b1889d92b1582d6744490
17 changes: 13 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -15,8 +15,7 @@ on:
push:
branches:
- develop
- releases
- v2
- releases/**
pull_request:
types:
- opened
@@ -61,7 +60,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -72,6 +71,16 @@ jobs:
# queries: security-extended,security-and-quality

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
with:
category: "/language:${{matrix.language}}"
- name: Generate Security Report
uses: rsdmike/github-security-report-action@a149b24539044c92786ec39af8ba38c93496495d # v3.0.4
with:
template: report
token: ${{ secrets.GITHUB_TOKEN }}
- name: GitHub Upload Release Artifacts
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
with:
name: codeql-report
path: "./report.pdf"
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ jobs:
- task: "visprompt"
test_dir: "tests/e2e/cli/visual_prompting"
name: E2E-Test-py310-${{ matrix.task }}
uses: ./.github/workflows/run_tests_in_tox.yml
uses: ./.github/workflows/run_tests_in_tox_custom.yml
with:
python-version: "3.10"
toxenv-pyver: "py310"
9 changes: 6 additions & 3 deletions .github/workflows/pre_merge.yml
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ jobs:
concurrency:
group: ${{ github.workflow }}-Unit-${{ github.event.pull_request.number || github.ref }}-${{ matrix.tox-env }}
cancel-in-progress: true
uses: ./.github/workflows/run_tests_in_tox.yml
uses: ./.github/workflows/run_tests_in_tox_custom.yml
with:
python-version: ${{ matrix.python-version }}
toxenv-pyver: ${{ matrix.tox-env }}
@@ -64,7 +64,10 @@ jobs:
concurrency:
group: ${{ github.workflow }}-Coverage-${{ github.event.pull_request.number || github.ref }}}
cancel-in-progress: true
runs-on: [self-hosted, linux, x64, dev]
runs-on: [otx-gpu-a10g-1]
container:
image: 219678651685.dkr.ecr.eu-west-1.amazonaws.com/ote-ci:11.7.1.2-devel-ubuntu20.04
options: "--runtime=nvidia --env-file=/home/runner/.nvidia.env --ipc=host"
steps:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -130,7 +133,7 @@ jobs:
concurrency:
group: ${{ github.workflow }}-Integration-${{ github.event.pull_request.number || github.ref }}-${{ matrix.task }}
cancel-in-progress: true
uses: ./.github/workflows/run_tests_in_tox.yml
uses: ./.github/workflows/run_tests_in_tox_custom.yml
with:
python-version: "3.10"
toxenv-pyver: "py310"
6 changes: 3 additions & 3 deletions .github/workflows/run_tests_in_tox_custom.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ on:
default: false
runs-on:
type: string
default: "['self-hosted', 'Linux', 'X64', 'dev']"
default: "['otx-gpu-a10g-1']"
task:
type: string
default: "undefined"
@@ -35,7 +35,7 @@ on:
default: "pt1"
container-options:
type: string
default: "--runtime=nvidia --env-file=/home/runner/.nvidia.env --shm-size=24g"
default: "--runtime=nvidia --env-file=/home/runner/.nvidia.env --ipc=host"

# Declare default permissions as read only.
permissions: read-all
@@ -46,7 +46,7 @@ jobs:
# https://github.com/orgs/community/discussions/11692
runs-on: ${{ fromJson(inputs.runs-on) }}
container:
image: 219678651685.dkr.ecr.eu-central-1.amazonaws.com/ote-ci:11.7.1.1-devel-ubuntu20.04
image: 219678651685.dkr.ecr.eu-west-1.amazonaws.com/ote-ci:11.7.1.2-devel-ubuntu20.04
options: ${{ inputs.container-options }}
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
Loading