From d80a827c3c649030de7cfe0c10ce462dc7743a19 Mon Sep 17 00:00:00 2001 From: Eliott Bouhana Date: Mon, 5 Aug 2024 14:53:11 +0200 Subject: [PATCH] go back to use a replace directive Signed-off-by: Eliott Bouhana --- .github/workflows/workflow_call.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/workflow_call.yml b/.github/workflows/workflow_call.yml index 68c187e6..ba8ed687 100644 --- a/.github/workflows/workflow_call.yml +++ b/.github/workflows/workflow_call.yml @@ -15,28 +15,29 @@ on: description: 'The ref to checkout dd-trace-go at' concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ inputs.dd-trace-go-ref }} cancel-in-progress: true jobs: integration-tests: - strategy: - fail-fast: false - matrix: - runs-on: [ macos, ubuntu, windows ] - go-version: [ '1.21', '1.22' ] - runs-on: ${{ matrix.runs-on }}-latest - name: Integration tests (go${{ matrix.go-version }}, ${{ matrix.runs-on }}) + runs-on: ubuntu-latest + name: Integration Smoke Tests steps: - name: Checkout orchestrion uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: path: orchestrion repository: DataDog/orchestrion + - name: Checkout dd-trace-go + uses: actions/checkout@v4 + with: + path: dd-trace-go + repository: DataDog/dd-trace-go + ref: ${{ inputs.dd-trace-go-ref }} - name: Setup go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5 with: - go-version: ${{ matrix.go-version }} + go-version: '1.21' cache-dependency-path: "**/*.sum" - name: Setup python uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5 @@ -53,8 +54,6 @@ jobs: run: |- set -x cd orchestrion/_integration-tests - ./orchestrion.exe go get gopkg.in/DataDog/dd-trace-go.v1@${{ inputs.dd-trace-go-ref }} + ./orchestrion.exe go mod edit -replace=gopkg.in/DataDog/dd-trace-go.v1=../../dd-trace-go ./orchestrion.exe go mod tidy - ./orchestrion.exe go test -v -shuffle=on ./... - env: - GOFLAGS: -tags=integration,buildtag # Globally set build tags (buildtag is used by the dd-span test) + ./orchestrion.exe go test -v -tags=integration,buildtag -shuffle=on ./...