Merge branch 'master' into dependabot/pip/jinja2-3.1.5

OWASP · Feb 3, 2025 · e474271 · e474271
2 parents 9a2e8c8 + 4a7c6f3
commit e474271
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -20,7 +20,7 @@ jobs:
   # Code quality checks.
   pre-commit:
     name: Run pre-commit
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
       - pre-commit
     permissions:
       security-events: write
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -64,7 +64,7 @@ jobs:
     name: Run tests
     needs:
       - pre-commit
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
     name: Build package
     needs:
       - run-tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -120,7 +120,7 @@ jobs:
       matrix:
         os:
           - macos-latest
-          - ubuntu-22.04
+          - ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -151,7 +151,7 @@ jobs:
     name: Test Docker image
     needs:
       - run-tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -207,13 +207,13 @@ jobs:
     name: Test Docker ${{ matrix.docker-version }} image build
     needs:
       - run-tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         docker-version:
-          - '24.0.6-1~ubuntu.22.04~jammy'
-          - '23.0.6-1~ubuntu.22.04~jammy'
-          - '20.10.13~3-0~ubuntu-jammy'
+          - '27.5.0-1~ubuntu.24.04~noble'
+          - '26.1.4-1~ubuntu.24.04~noble'
+          - '26.0.0-1~ubuntu.24.04~noble'
     steps:
       - name: Uninstall pre-installed Docker
         run: |
@@ -255,7 +255,7 @@ jobs:
     needs:
       - test-docker-image
       - test-docker-image-build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -286,7 +286,7 @@ jobs:
     needs:
       - test-docker-image
       - test-docker-image-build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -323,7 +323,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Get package artifacts
         uses: actions/download-artifact@v4
@@ -349,7 +349,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Get package artifacts
         uses: actions/download-artifact@v4

diff --git a/nettacker/locale/ko.yaml b/nettacker/locale/ko.yaml
@@ -207,3 +207,8 @@ no_response: 목표에서 응답을 얻을 수 없다.
 category_framework: "카테고리 : {0}, 프레임 워크 : {1}이 (가) 발견되었습니다!"
 nothing_found: "{1}의 {0}에 아무것도 없습니다!"
 no_auth: "{0}에서 인증을 찾을 수 없습니다 : {1}"
+compare_report_path_filename: "비교 스캔 보고서를 저장할 파일 경로"
+no_scan_to_compare: "비교할 scan_id를 찾을 수 없습니다"
+compare_report_saved: "비교 결과가 {0}에 저장되었습니다"
+build_compare_report: "비교 보고서 생성 중"
+finish_build_report: "비교 보고서 생성 완료"