diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0ae4b5f4bed..6f46afdbff2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,8 @@ on: branches-ignore: - 'release/*' pull_request: +env: + CONTRIB_REPO_SHA: d4b5a955681400d038beb74b52aa74a08a4113bd jobs: build: @@ -41,13 +43,13 @@ jobs: python-version: py35 package: instrumentation steps: - - name: Checkout Core Repo at SHA - ${{ github.sha }} + - name: Checkout Core Repo @ SHA - ${{ github.sha }} uses: actions/checkout@v2 - - name: Checkout Contrib Repo @ SHA d4b5a955681400d038beb74b52aa74a08a4113bd + - name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} uses: actions/checkout@v2 with: repository: open-telemetry/opentelemetry-python-contrib - ref: d4b5a955681400d038beb74b52aa74a08a4113bd + ref: ${{ env.CONTRIB_REPO_SHA }} path: opentelemetry-python-contrib - name: Set up Python ${{ env[matrix.python-version] }} uses: actions/setup-python@v2 @@ -71,13 +73,13 @@ jobs: name: ${{ matrix.tox-environment }} runs-on: ubuntu-latest steps: - - name: Checkout Core Repo at SHA - ${{ github.sha }} + - name: Checkout Core Repo @ SHA - ${{ github.sha }} uses: actions/checkout@v2 - - name: Checkout Contrib Repo @ SHA d4b5a955681400d038beb74b52aa74a08a4113bd + - name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} uses: actions/checkout@v2 with: repository: open-telemetry/opentelemetry-python-contrib - ref: d4b5a955681400d038beb74b52aa74a08a4113bd + ref: ${{ env.CONTRIB_REPO_SHA }} path: opentelemetry-python-contrib - name: Set up Python 3.8 uses: actions/setup-python@v2 diff --git a/docs/conf.py b/docs/conf.py index 4ccb1ca0b1c..b227cb51818 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -35,11 +35,9 @@ if isdir(join(exp, f)) ] -instr = "../opentelemetry-python-contrib/instrumentation" +instr = "../instrumentation" instr_dirs = [ - os.path.abspath( - "/".join(["../opentelemetry-python-contrib/instrumentation", f, "src"]) - ) + os.path.abspath("/".join(["../instrumentation", f, "src"])) for f in listdir(instr) if isdir(join(instr, f)) ]