diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b12768ccf..88cdc0bde 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -8,20 +8,34 @@ jobs: strategy: fail-fast: false matrix: - java_version: ['11', '17', '20'] + java_version: ['17', '20'] os: [ubuntu-latest, windows-latest, macOS-latest] + include: + - os: windows-latest + prefix: win + - os: ubuntu-latest + prefix: nix + - os: macOS-latest + prefix: mac steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.0 + with: + submodules: true + lfs: true - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java_version }} - distribution: 'adopt' + distribution: 'liberica' - name: Build with Gradle run: ./gradlew check --stacktrace - name: Archive test results - if: failure() - uses: actions/upload-artifact@v3.1.0 + if: always() && matrix.prefix == 'nix' + uses: EnricoMi/publish-unit-test-result-action@v2 + with: + junit_files: "**/test-results/test/**/*.xml" + - name: Archive test results + if: always() && matrix.prefix != 'nix' + uses: EnricoMi/publish-unit-test-result-action/composite@v2 with: - name: junit_report_${{ matrix.os }}_${{ matrix.java_version }} - path: build/reports/tests/test + junit_files: "**/test-results/test/**/*.xml" diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b302a2832..2ee163185 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -16,21 +16,23 @@ jobs: build-deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.0 + with: + submodules: true + lfs: true - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 - distribution: 'adopt' - + distribution: 'liberica' - name: Build javadoc run: ./gradlew --no-daemon javadoc - name: Set up Python - uses: actions/setup-python@v4.2.0 + uses: actions/setup-python@v5.0.0 with: - python-version: '3.6' + python-version: '3.10' architecture: 'x64' - name: Install dependencies @@ -122,7 +124,7 @@ jobs: cp -R temp/site/. public/dev/en - name: Deploy - uses: peaceiris/actions-gh-pages@v3.8.0 + uses: peaceiris/actions-gh-pages@v3.9.3 with: deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} publish_branch: gh-pages diff --git a/.github/workflows/publish-to-sonatype.yml b/.github/workflows/publish-to-sonatype.yml new file mode 100644 index 000000000..df99ce4f4 --- /dev/null +++ b/.github/workflows/publish-to-sonatype.yml @@ -0,0 +1,37 @@ +name: Publish to Sonatype + +on: + release: + types: [published] + push: + branches: + - develop + workflow_dispatch: + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: 'liberica' + - name: Publish to Sonatype + run: ./gradlew publishMavenPublicationToSonatypeRepository -PsimplifyVersion + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryPassword: ${{ secrets.GPG_SIGNING_PASSWORD }} + - name: Close repository + if: github.event_name == 'release' + run: ./gradlew closeAndReleaseRepository + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} + ORG_GRADLE_PROJECT_nexusUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_nexusPassword: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/.github/workflows/qa-sq.yml b/.github/workflows/qa-sq.yml new file mode 100644 index 000000000..eb32ed7a9 --- /dev/null +++ b/.github/workflows/qa-sq.yml @@ -0,0 +1,31 @@ +name: QA + +on: + push: + branches: + - develop + - master + pull_request: + +jobs: + QA: + runs-on: ubuntu-latest + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name + steps: + - uses: actions/checkout@v4.1.0 + with: + fetch-depth: '' + submodules: true + lfs: true + - run: | + git fetch --prune --unshallow + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: 'liberica' + - name: SonarCloud Scan + run: ./gradlew check sonar + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml deleted file mode 100644 index fac1d0ccf..000000000 --- a/.github/workflows/qa.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: QA - -on: - push: - branches: - - develop - - master - pull_request: - -jobs: - QA: - runs-on: ubuntu-latest - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name - steps: - - uses: actions/checkout@v3.1.0 - with: - fetch-depth: '' - - run: | - git fetch --prune --unshallow - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: 'adopt' - - name: SonarCloud Scan - run: ./gradlew check sonarqube - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3987ce14a..4f81bd928 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,10 @@ build/ *.orig /.idea/jarRepositories.xml /.idea/compiler.xml -/.idea/**/*.iml +/.idea/inspectionProfiles/Project_Default.xml +/.idea/modules.xml +*.iml +/.idea/workspace.xml +/.idea/sonar* + +/.idea/misc.xml diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..579e59c8e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,8 @@ +[submodule "src/test/resources/ext/designer/ssl_3_1"] + path = src/test/resources/ext/designer/ssl_3_1 + url = ../ssl_3_1.git + shallow = true +[submodule "src/test/resources/ext/edt/ssl_3_1"] + path = src/test/resources/ext/edt/ssl_3_1 + url = ../ssl_3_1_edt.git + shallow = true diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 4e322887b..000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -mdclasses \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a179..000000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/dictionaries/vmaksimov.xml b/.idea/dictionaries/vmaksimov.xml deleted file mode 100644 index 4347b031c..000000000 --- a/.idea/dictionaries/vmaksimov.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - autonumeration - mdclass - xdto - автонумерации - враппер - десериализации - парсим - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index cae81d0c5..a176339ca 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,21 +1,16 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/.idea/mdclasses.iml b/.idea/mdclasses.iml deleted file mode 100644 index 78b2cc53b..000000000 --- a/.idea/mdclasses.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8f27022c6..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 3607d3056..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index f29f32db5..ba670089a 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -4,5 +4,6 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index dfe8de79f..000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -