diff --git a/.github/scripts/strategy-matrix/linux.json b/.github/scripts/strategy-matrix/linux.json index faac3b100f..15b8178c13 100644 --- a/.github/scripts/strategy-matrix/linux.json +++ b/.github/scripts/strategy-matrix/linux.json @@ -1,51 +1,6 @@ { "image_tag": "sha-fe4c8ae", "configs": { - "ubuntu": [ - { - "compiler": ["gcc", "clang"], - "build_type": ["Debug", "Release"], - "arch": ["amd64", "arm64"] - }, - - { - "compiler": ["gcc", "clang"], - "build_type": ["Debug", "Release"], - "arch": ["amd64"], - "sanitizers": ["address", "undefinedbehavior"] - }, - - { - "compiler": ["gcc"], - "build_type": ["Debug"], - "arch": ["amd64"], - "suffix": "coverage", - "extra_cmake_args": "-DUNIT_TEST_REFERENCE_FEE=500 -Dcoverage=ON -Dcoverage_format=xml -DCODE_COVERAGE_VERBOSE=ON -DCMAKE_C_FLAGS=-O0 -DCMAKE_CXX_FLAGS=-O0" - }, - { - "compiler": ["clang"], - "build_type": ["Debug"], - "arch": ["amd64"], - "suffix": "voidstar", - "extra_cmake_args": "-Dvoidstar=ON" - }, - { - "compiler": ["clang"], - "build_type": ["Release"], - "arch": ["amd64"], - "suffix": "reffee", - "extra_cmake_args": "-DUNIT_TEST_REFERENCE_FEE=1000" - }, - { - "compiler": ["gcc"], - "build_type": ["Debug"], - "arch": ["amd64"], - "suffix": "unity", - "extra_cmake_args": "-Dunity=ON", - "exclude_event_types": ["pull_request"] - } - ], - "debian": [ { "compiler": ["gcc"], diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml index e30133bc74..ada7ed79e1 100644 --- a/.github/workflows/on-pr.yml +++ b/.github/workflows/on-pr.yml @@ -105,27 +105,6 @@ jobs: outputs: go: ${{ steps.go.outputs.go == 'true' }} - check-levelization: - needs: should-run - if: ${{ needs.should-run.outputs.go == 'true' }} - uses: ./.github/workflows/reusable-check-levelization.yml - - check-rename: - needs: should-run - if: ${{ needs.should-run.outputs.go == 'true' }} - uses: ./.github/workflows/reusable-check-rename.yml - - clang-tidy: - needs: should-run - if: ${{ needs.should-run.outputs.go == 'true' }} - uses: ./.github/workflows/reusable-clang-tidy.yml - permissions: - issues: write - contents: read - with: - check_only_changed: true - create_issue_on_failure: false - build-test: needs: should-run if: ${{ needs.should-run.outputs.go == 'true' }} @@ -133,7 +112,7 @@ jobs: strategy: fail-fast: false matrix: - os: [linux, macos, windows] + os: [linux] with: # Enable ccache only for events targeting the XRPLF repository, since # other accounts will not have access to our remote cache storage. @@ -152,45 +131,12 @@ jobs: if: ${{ needs.should-run.outputs.go == 'true' }} uses: ./.github/workflows/reusable-test-conan-package.yml - upload-recipe: - needs: - - should-run - - build-test - - test-conan-package - # Only run when committing to a PR that targets a release branch. - if: ${{ github.repository == 'XRPLF/rippled' && needs.should-run.outputs.go == 'true' && github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release') }} - uses: ./.github/workflows/reusable-upload-recipe.yml - secrets: - remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }} - remote_password: ${{ secrets.CONAN_REMOTE_PASSWORD }} - - notify-clio: - needs: upload-recipe - runs-on: ubuntu-latest - steps: - # Notify the Clio repository about the newly proposed release version, so - # it can be checked for compatibility before the release is actually made. - - name: Notify Clio - env: - GH_TOKEN: ${{ secrets.CLIO_NOTIFY_TOKEN }} - PR_URL: ${{ github.event.pull_request.html_url }} - run: | - gh api --method POST -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/xrplf/clio/dispatches -f "event_type=check_libxrpl" \ - -F "client_payload[ref]=${{ needs.upload-recipe.outputs.recipe_ref }}" \ - -F "client_payload[pr_url]=${PR_URL}" - passed: if: failure() || cancelled() needs: - - check-levelization - - check-rename - - clang-tidy - build-test - package - test-conan-package - - upload-recipe - - notify-clio runs-on: ubuntu-latest steps: - name: Fail diff --git a/.github/workflows/on-trigger.yml b/.github/workflows/on-trigger.yml index 3659601c32..ea8727db45 100644 --- a/.github/workflows/on-trigger.yml +++ b/.github/workflows/on-trigger.yml @@ -67,21 +67,12 @@ defaults: shell: bash jobs: - clang-tidy: - uses: ./.github/workflows/reusable-clang-tidy.yml - permissions: - issues: write - contents: read - with: - check_only_changed: false - create_issue_on_failure: ${{ github.event_name == 'schedule' }} - build-test: uses: ./.github/workflows/reusable-build-test.yml strategy: fail-fast: ${{ github.event_name == 'merge_group' }} matrix: - os: [linux, macos, windows] + os: [linux] with: # Enable ccache only for events targeting the XRPLF repository, since # other accounts will not have access to our remote cache storage. @@ -96,17 +87,6 @@ jobs: test-conan-package: uses: ./.github/workflows/reusable-test-conan-package.yml - upload-recipe: - needs: - - build-test - - test-conan-package - # Only run when pushing to the develop branch. - if: ${{ github.repository == 'XRPLF/rippled' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }} - uses: ./.github/workflows/reusable-upload-recipe.yml - secrets: - remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }} - remote_password: ${{ secrets.CONAN_REMOTE_PASSWORD }} - package: needs: build-test uses: ./.github/workflows/reusable-package.yml