From 4dc2061b3794d57e944d3b524c4e4fbdd70e9653 Mon Sep 17 00:00:00 2001 From: techy4shri Date: Fri, 2 May 2025 21:27:15 +0530 Subject: [PATCH 1/2] version changes in action files --- .github/workflows/build-on-pull-request.yml | 6 +++--- .github/workflows/package.yml | 6 +++--- .github/workflows/sast.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml index 7371d7ef..7d2adf5f 100644 --- a/.github/workflows/build-on-pull-request.yml +++ b/.github/workflows/build-on-pull-request.yml @@ -2,7 +2,7 @@ name: Build On Pull Request on: pull_request: branches: [ "develop","master" ] - + jobs: Build: runs-on: ubuntu-latest @@ -14,10 +14,10 @@ jobs: repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Setup JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 17 - distribution: 'adopt' + distribution: 'temurin' - name: Build with Maven run: mvn clean install diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index ffc82ba6..1fda0442 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -21,13 +21,13 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 17 - distribution: 'adopt' + distribution: 'temurin' - name: Build with Maven run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml index 9e845b57..18b663b8 100644 --- a/.github/workflows/sast.yml +++ b/.github/workflows/sast.yml @@ -38,10 +38,10 @@ jobs: uses: github/codeql-action/init@v2 - name: Setup JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 17 - distribution: 'adopt' + distribution: 'temurin' - name: Build with Maven run: mvn clean install From 1353aafd093f7c544b3646a9caf453ee0141bc26 Mon Sep 17 00:00:00 2001 From: techy4shri Date: Fri, 2 May 2025 22:03:16 +0530 Subject: [PATCH 2/2] correct indentation and trailing whitespace --- .github/workflows/package.yml | 2 +- .github/workflows/sast.yml | 40 +++++++++++++++++------------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 1fda0442..983f2b78 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code + - name: Checkout code uses: actions/checkout@v3 - name: Setup JDK 17 diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml index 18b663b8..481d28b2 100644 --- a/.github/workflows/sast.yml +++ b/.github/workflows/sast.yml @@ -27,26 +27,26 @@ jobs: language: [ 'java' ] steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} + - name: Checkout code + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 - - name: Setup JDK 17 - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: 'temurin' - - - name: Build with Maven - run: mvn clean install + - name: Setup JDK 17 + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: 'temurin' + + - name: Build with Maven + run: mvn clean install - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{matrix.language}}"