diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml index 15342f7c..97796d94 100644 --- a/.github/workflows/build-on-pull-request.yml +++ b/.github/workflows/build-on-pull-request.yml @@ -14,9 +14,9 @@ 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 69a358ae..f3aaaeb8 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -21,19 +21,19 @@ jobs: - name: Checkout code 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 }} - + - name: Build WAR file run: mvn -B package --file pom.xml - + - name: Upload WAR file as artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml index 2f602974..a2d5781d 100644 --- a/.github/workflows/sast.yml +++ b/.github/workflows/sast.yml @@ -4,12 +4,12 @@ on: push: branches: [ "develop" ] paths-ignore: - - target/** - + - target/** + pull_request: branches: [ "develop" ] paths-ignore: - - target/** + - target/** jobs: analyze: @@ -25,28 +25,29 @@ jobs: fail-fast: false matrix: language: [ 'java' ] - + steps: - - name: Checkout code - uses: actions/checkout@v3 - with: + - 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 + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} - - name: Setup JDK 17 - uses: actions/setup-java@v2 - with: + - name: Setup JDK 17 + uses: actions/setup-java@v4 + with: java-version: 17 - distribution: 'adopt' - - - name: Build with Maven - run: mvn clean install - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" + distribution: 'temurin' + + - name: Build with Maven + run: mvn clean install + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{ matrix.language }}" diff --git a/README.md b/README.md index b011397d..8bee9eb0 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,11 @@ Common API is a microservice whch acts as a gateway for AMRIT. There are many AP ## Environment and Setup For setting up the development environment, please refer to the [Developer Guide](https://piramal-swasthya.gitbook.io/amrit/developer-guide/development-environment-setup) . +Prerequisites +* JDK 17 +* Maven +* Springboot V2 +* MySQL ## API Guide Detailed information on API endpoints can be found in the [API Guide](https://piramal-swasthya.gitbook.io/amrit/architecture/api-guide).