diff --git a/.github/actions/test-gradle-project/action.yaml b/.github/actions/test-gradle-project/action.yaml deleted file mode 100644 index 80725566e..000000000 --- a/.github/actions/test-gradle-project/action.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: "Test gradle project" - -inputs: - project-name: - description: "Name of gradle project to test" - required: true - java-version: - description: "JDK to use" - required: true - -runs: - using: "composite" - steps: - - uses: ./.github/actions/setup-jdk - with: - java-version: ${{inputs.java-version}} - - uses: ./.github/actions/setup-gradle-cache - - name: Run tests - shell: bash - run: ./gradlew ${{inputs.project-name}}:test --parallel - - name: Archive test results - uses: actions/upload-artifact@v3 - if: always() - with: - name: ${{inputs.project-name}}-test-results - path: ${{inputs.project-name}}/build/reports/tests/test/ - if-no-files-found: ignore \ No newline at end of file diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 8725b30b7..04bca20a7 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -20,7 +20,7 @@ jobs: - uses: ./.github/actions/setup-jdk - uses: ./.github/actions/setup-gradle-cache - name: Compile - run: ./gradlew compileJava compileTestJava + run: ./gradlew compileJava snyk-test: runs-on: ubuntu-latest @@ -63,57 +63,4 @@ jobs: - name: Compile run: ./gradlew compileJava compileTestJava - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - - format-checks: - runs-on: ubuntu-latest - needs: compile - - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup-jdk - - uses: ./.github/actions/setup-gradle-cache - - name: Check all the files are properly formatted - run: ./gradlew spotlessCheck - - license-checks: - runs-on: ubuntu-latest - needs: compile - - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup-jdk - - uses: ./.github/actions/setup-gradle-cache - - name: Check LICENSE and NOTICE files - run: ./gradlew validateLicenses generateLicensesFiles - - tests: - strategy: - fail-fast: false - matrix: - project: ['common', 'core', 'processor', 'test-utils', 'it'] - java-version: ['17', '21'] - env: - DOCKER_ENTERPRISE_DEV_URL: ${{ secrets.DOCKER_ENTERPRISE_DEV_URL }} - DOCKER_COMMUNITY_DEV_URL: ${{ secrets.DOCKER_COMMUNITY_DEV_URL }} - ENTERPRISE_TAR: enterprise-docker.tar - COMMUNITY_TAR: community-docker.tar - - runs-on: ubuntu-latest - needs: compile - steps: - - uses: actions/checkout@v3 - - name: Download neo4j dev docker container - if: matrix.project == 'it' - run: | - curl -s -L0 -u "${TEAMCITY_USER}:${TEAMCITY_PASSWORD}" -X GET ${DOCKER_ENTERPRISE_DEV_URL} -o ${ENTERPRISE_TAR} & - curl -s -L0 -u "${TEAMCITY_USER}:${TEAMCITY_PASSWORD}" -X GET ${DOCKER_COMMUNITY_DEV_URL} -o ${COMMUNITY_TAR} & - wait - docker load --input ${ENTERPRISE_TAR} - docker load --input ${COMMUNITY_TAR} - - - name: Run ${{ matrix.project }} tests with JDK ${{ matrix.java-version }} - uses: ./.github/actions/test-gradle-project - with: - project-name: ${{ matrix.project }} - java-version: ${{ matrix.java-version }} + uses: github/codeql-action/analyze@v2 \ No newline at end of file