From 41759c8c227f95b8d918d58e03da9c77cae01f45 Mon Sep 17 00:00:00 2001 From: Dmytro Pashynskyi <61313167+dspashynskyi@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:51:00 +0200 Subject: [PATCH 1/5] chore: optimize trivy --- .github/workflows/deploy_dev.yml | 2 +- .github/workflows/pr-title-check.yml | 2 +- .github/workflows/pr.yml | 3 +-- .github/workflows/release.yml | 2 +- trivy.yaml | 13 +++++++++++++ 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 trivy.yaml diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index d3fa269..9e184bc 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -6,7 +6,7 @@ on: jobs: gitlab-dev-deploy: if: ${{ github.event.registry_package.package_version.container_metadata.tag.name == 'development' }} - uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.7.0 + uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.10.0 with: gitlab-project-id: "1829" gitlab-project-ref: "master" diff --git a/.github/workflows/pr-title-check.yml b/.github/workflows/pr-title-check.yml index 495a191..41f4764 100644 --- a/.github/workflows/pr-title-check.yml +++ b/.github/workflows/pr-title-check.yml @@ -9,6 +9,6 @@ on: jobs: pr-title-check: - uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.7.0 + uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.10.0 secrets: ACTIONS_BOT_TOKEN: ${{ secrets.ACTIONS_BOT_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2692edb..d9f7c6d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,5 +6,4 @@ on: jobs: run_tests: - uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.7.0 - secrets: inherit + uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.10.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96625d2..b651943 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,5 +6,5 @@ on: jobs: release: - uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.7.0 + uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.10.0 secrets: inherit diff --git a/trivy.yaml b/trivy.yaml new file mode 100644 index 0000000..5b009e3 --- /dev/null +++ b/trivy.yaml @@ -0,0 +1,13 @@ +# Trivy configuration file +# https://aquasecurity.github.io/trivy/latest/docs/references/configuration/config-file/ +# Can be deleted after public ecr mirror will be added by default +db: + no-progress: true + repository: + - ghcr.io/aquasecurity/trivy-db:2 + - public.ecr.aws/aquasecurity/trivy-db:2 + java-repository: + - ghcr.io/aquasecurity/trivy-java-db:1 + - public.ecr.aws/aquasecurity/trivy-java-db:1 +misconfiguration: + checks-bundle-repository: public.ecr.aws/aquasecurity/trivy-checks \ No newline at end of file From d60607583360cfd6057446ec0e724066e3d3b261 Mon Sep 17 00:00:00 2001 From: Dmytro Pashynskyi <61313167+dspashynskyi@users.noreply.github.com> Date: Fri, 29 Nov 2024 16:40:46 +0200 Subject: [PATCH 2/5] change ai-dial-ci versiob --- .github/workflows/deploy_dev.yml | 2 +- .github/workflows/pr-title-check.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 9e184bc..325a0d6 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -6,7 +6,7 @@ on: jobs: gitlab-dev-deploy: if: ${{ github.event.registry_package.package_version.container_metadata.tag.name == 'development' }} - uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.10.0 + uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.9.4 with: gitlab-project-id: "1829" gitlab-project-ref: "master" diff --git a/.github/workflows/pr-title-check.yml b/.github/workflows/pr-title-check.yml index 41f4764..1e5a444 100644 --- a/.github/workflows/pr-title-check.yml +++ b/.github/workflows/pr-title-check.yml @@ -9,6 +9,6 @@ on: jobs: pr-title-check: - uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.10.0 + uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.9.4 secrets: ACTIONS_BOT_TOKEN: ${{ secrets.ACTIONS_BOT_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d9f7c6d..736d4c8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,4 +6,4 @@ on: jobs: run_tests: - uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.10.0 + uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.9.4 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b651943..d5b029b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,5 +6,5 @@ on: jobs: release: - uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.10.0 + uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.9.4 secrets: inherit From 675555b8b93dedd30d7e1f92497640126a27a673 Mon Sep 17 00:00:00 2001 From: Dmytro Pashynskyi <61313167+dspashynskyi@users.noreply.github.com> Date: Fri, 29 Nov 2024 16:53:47 +0200 Subject: [PATCH 3/5] revert values --- .github/workflows/deploy_dev.yml | 2 +- .github/workflows/pr-title-check.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 325a0d6..d3fa269 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -6,7 +6,7 @@ on: jobs: gitlab-dev-deploy: if: ${{ github.event.registry_package.package_version.container_metadata.tag.name == 'development' }} - uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.9.4 + uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.7.0 with: gitlab-project-id: "1829" gitlab-project-ref: "master" diff --git a/.github/workflows/pr-title-check.yml b/.github/workflows/pr-title-check.yml index 1e5a444..495a191 100644 --- a/.github/workflows/pr-title-check.yml +++ b/.github/workflows/pr-title-check.yml @@ -9,6 +9,6 @@ on: jobs: pr-title-check: - uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.9.4 + uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.7.0 secrets: ACTIONS_BOT_TOKEN: ${{ secrets.ACTIONS_BOT_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 736d4c8..8387131 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,4 +6,4 @@ on: jobs: run_tests: - uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.9.4 \ No newline at end of file + uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.7.0 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d5b029b..96625d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,5 +6,5 @@ on: jobs: release: - uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.9.4 + uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.7.0 secrets: inherit From 4890898c9dcfb862ce8f41c032e6864f5e88faaa Mon Sep 17 00:00:00 2001 From: Dmytro Pashynskyi <61313167+dspashynskyi@users.noreply.github.com> Date: Thu, 12 Dec 2024 12:41:12 +0200 Subject: [PATCH 4/5] update ai-dial-ci to 1.10.0 --- .github/workflows/deploy_dev.yml | 2 +- .github/workflows/pr-title-check.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index d3fa269..9e184bc 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -6,7 +6,7 @@ on: jobs: gitlab-dev-deploy: if: ${{ github.event.registry_package.package_version.container_metadata.tag.name == 'development' }} - uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.7.0 + uses: epam/ai-dial-ci/.github/workflows/deploy-development.yml@1.10.0 with: gitlab-project-id: "1829" gitlab-project-ref: "master" diff --git a/.github/workflows/pr-title-check.yml b/.github/workflows/pr-title-check.yml index 495a191..41f4764 100644 --- a/.github/workflows/pr-title-check.yml +++ b/.github/workflows/pr-title-check.yml @@ -9,6 +9,6 @@ on: jobs: pr-title-check: - uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.7.0 + uses: epam/ai-dial-ci/.github/workflows/pr-title-check.yml@1.10.0 secrets: ACTIONS_BOT_TOKEN: ${{ secrets.ACTIONS_BOT_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8387131..95a3f6d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,4 +6,4 @@ on: jobs: run_tests: - uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.7.0 \ No newline at end of file + uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.10.0 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96625d2..b651943 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,5 +6,5 @@ on: jobs: release: - uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.7.0 + uses: epam/ai-dial-ci/.github/workflows/python_docker_release.yml@1.10.0 secrets: inherit From 511ecdb937b8d97266dfe465503d0697961e67b0 Mon Sep 17 00:00:00 2001 From: Dmytro Pashynskyi <61313167+dspashynskyi@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:49:25 +0200 Subject: [PATCH 5/5] add fixed ort version --- .github/workflows/pr.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 95a3f6d..6d867c3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,4 +6,7 @@ on: jobs: run_tests: - uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.10.0 \ No newline at end of file + uses: epam/ai-dial-ci/.github/workflows/python_docker_pr.yml@1.10.0 + secrets: inherit + with: + ort_version: 42.1.0 \ No newline at end of file