Skip to content

Commit aa9bffe

Browse files
authored
Update dependencies (#3750)
* update dependency to resolve some CVEs * update version string to 1.6.3rc0 * update premerge workflow * add setuptools version constraint * apply setuptools constraint to dev dependency
1 parent 2c278b2 commit aa9bffe

File tree

8 files changed

+169
-147
lines changed

8 files changed

+169
-147
lines changed

.github/workflows/codeql.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ on:
1515
push:
1616
branches:
1717
- develop
18-
- releases
19-
- v2
18+
- releases/**
2019
pull_request:
2120
types:
2221
- opened
@@ -61,7 +60,7 @@ jobs:
6160

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

7473
- name: Perform CodeQL Analysis
75-
uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
74+
uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
7675
with:
7776
category: "/language:${{matrix.language}}"
77+
- name: Generate Security Report
78+
uses: rsdmike/github-security-report-action@a149b24539044c92786ec39af8ba38c93496495d # v3.0.4
79+
with:
80+
template: report
81+
token: ${{ secrets.GITHUB_TOKEN }}
82+
- name: GitHub Upload Release Artifacts
83+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
84+
with:
85+
name: codeql-report
86+
path: "./report.pdf"

.github/workflows/daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- task: "visprompt"
3131
test_dir: "tests/e2e/cli/visual_prompting"
3232
name: E2E-Test-py310-${{ matrix.task }}
33-
uses: ./.github/workflows/run_tests_in_tox.yml
33+
uses: ./.github/workflows/run_tests_in_tox_custom.yml
3434
with:
3535
python-version: "3.10"
3636
toxenv-pyver: "py310"

.github/workflows/pre_merge.yml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ on:
1515
# Declare default permissions as read only.
1616
permissions: read-all
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-PreMerge-${{ github.event.pull_request.number || github.ref }}
20+
cancel-in-progress: true
21+
1822
jobs:
1923
Code-Quality-Checks:
20-
# This is what will cancel the job concurrency
21-
concurrency:
22-
group: ${{ github.workflow }}-Linting-${{ github.event.pull_request.number || github.ref }}
23-
cancel-in-progress: true
2424
runs-on: ubuntu-20.04
2525
steps:
2626
- name: Checkout repository
@@ -46,11 +46,7 @@ jobs:
4646
- python-version: "3.9"
4747
tox-env: "py39"
4848
name: Unit-Test-with-Python${{ matrix.python-version }}
49-
# This is what will cancel the job concurrency
50-
concurrency:
51-
group: ${{ github.workflow }}-Unit-${{ github.event.pull_request.number || github.ref }}-${{ matrix.tox-env }}
52-
cancel-in-progress: true
53-
uses: ./.github/workflows/run_tests_in_tox.yml
49+
uses: ./.github/workflows/run_tests_in_tox_custom.yml
5450
with:
5551
python-version: ${{ matrix.python-version }}
5652
toxenv-pyver: ${{ matrix.tox-env }}
@@ -61,10 +57,10 @@ jobs:
6157
artifact-prefix: "unit-test-results"
6258
Coverage-Test:
6359
needs: Code-Quality-Checks
64-
concurrency:
65-
group: ${{ github.workflow }}-Coverage-${{ github.event.pull_request.number || github.ref }}}
66-
cancel-in-progress: true
67-
runs-on: [self-hosted, linux, x64, dev]
60+
runs-on: [otx-gpu-a10g-1]
61+
container:
62+
image: 219678651685.dkr.ecr.eu-west-1.amazonaws.com/ote-ci:11.7.1.2-devel-ubuntu20.04
63+
options: "--runtime=nvidia --env-file=/home/runner/.nvidia.env --ipc=host"
6864
steps:
6965
- name: Checkout repository
7066
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -126,11 +122,7 @@ jobs:
126122
- task: "visprompt"
127123
test_dir: "tests/integration/cli/visual_prompting"
128124
name: Integration-Test-py310-${{ matrix.task }}
129-
# This is what will cancel the job concurrency
130-
concurrency:
131-
group: ${{ github.workflow }}-Integration-${{ github.event.pull_request.number || github.ref }}-${{ matrix.task }}
132-
cancel-in-progress: true
133-
uses: ./.github/workflows/run_tests_in_tox.yml
125+
uses: ./.github/workflows/run_tests_in_tox_custom.yml
134126
with:
135127
python-version: "3.10"
136128
toxenv-pyver: "py310"

.github/workflows/run_tests_in_tox_custom.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
default: false
2424
runs-on:
2525
type: string
26-
default: "['self-hosted', 'Linux', 'X64', 'dev']"
26+
default: "['otx-gpu-a10g-1']"
2727
task:
2828
type: string
2929
default: "undefined"
@@ -35,7 +35,7 @@ on:
3535
default: "pt1"
3636
container-options:
3737
type: string
38-
default: "--runtime=nvidia --env-file=/home/runner/.nvidia.env --shm-size=24g"
38+
default: "--runtime=nvidia --env-file=/home/runner/.nvidia.env --ipc=host"
3939

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

0 commit comments

Comments
 (0)