diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f607140..ef6f95d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,6 @@ jobs: with: go-version: ${{ matrix.go-version }} test-target: sdk-test - contract-tests: true test-windows: name: ${{ format('Windows, Go {0}', matrix.go-version) }} diff --git a/.github/workflows/common_ci.yml b/.github/workflows/common_ci.yml index 2d228a29..f0e4e4bb 100644 --- a/.github/workflows/common_ci.yml +++ b/.github/workflows/common_ci.yml @@ -6,14 +6,6 @@ on: description: "Go version to use for the jobs." required: true type: string - test-target: - type: string - description: 'The test target to run.' - required: true - contract-tests: - type: boolean - description: 'True to run the contract tests' - required: true jobs: unit-test-and-coverage: @@ -28,7 +20,7 @@ jobs: - uses: ./.github/actions/unit-tests with: lint: 'true' - test-target: ${{ inputs.test-target }} + test-target: sdk-test - uses: ./.github/actions/coverage with: enforce: 'false' @@ -36,7 +28,6 @@ jobs: contract-tests: runs-on: ubuntu-latest name: 'Contract Tests' - if: inputs.contract-tests env: TEST_SERVICE_PORT: 8000 steps: @@ -60,8 +51,6 @@ jobs: name: Contract-test-service-logs-${{ steps.go-version.outputs.version }} path: /tmp/sdk-contract-test-service.log - - benchmarks: name: 'Benchmarks' runs-on: ubuntu-latest diff --git a/.github/workflows/ldotel-ci.yml b/.github/workflows/ldotel-ci.yml index 4960dcb5..8300ce22 100644 --- a/.github/workflows/ldotel-ci.yml +++ b/.github/workflows/ldotel-ci.yml @@ -1,4 +1,4 @@ -name: Build and Test ldotel +name: Build and Test SDK on: push: branches: [ 'v7', 'feat/**' ] @@ -22,8 +22,17 @@ jobs: fail-fast: false matrix: go-version: ${{ fromJSON(needs.go-versions.outputs.matrix) }} - uses: ./.github/workflows/common_ci.yml - with: - go-version: ${{ matrix.go-version }} - test-target: ldotel-test - contract-tests: false + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup Go ${{ inputs.go-version }} + uses: actions/setup-go@v5 + with: + go-version: ${{ inputs.go-version }} + - uses: ./.github/actions/unit-tests + with: + lint: 'true' + test-target: ldotel-test + - uses: ./.github/actions/coverage + with: + enforce: 'false' \ No newline at end of file