From 691d7af53eb4e218062a77dde96aa2eed2cf7186 Mon Sep 17 00:00:00 2001 From: Nathaniel Ruiz Nowell Date: Wed, 4 Nov 2020 11:00:31 -0800 Subject: [PATCH] Set CI to pull Core at v0.16dev0 --- .github/workflows/test.yml | 14 ++++++++------ README.md | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 382b9da344..5e2dead6dc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,8 @@ on: branches-ignore: - 'release/*' pull_request: +env: + CORE_REPO_SHA: 47483865854c7adae7455f8441dab7f814f4ce2a jobs: build: @@ -32,13 +34,13 @@ jobs: python-version: py35 package: instrumentation steps: - - name: Checkout Contrib Repo at SHA - ${{ github.sha }} + - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} uses: actions/checkout@v2 - - name: Checkout Core Repo @ tag v0.15b0 + - name: Checkout Core Repo @ SHA - ${{ env.CORE_REPO_SHA }} uses: actions/checkout@v2 with: repository: open-telemetry/opentelemetry-python - ref: v0.15b0 + ref: ${{ env.CORE_REPO_SHA }} path: opentelemetry-python-core - name: Set up Python ${{ env[matrix.python-version] }} uses: actions/setup-python@v2 @@ -62,13 +64,13 @@ jobs: name: ${{ matrix.tox-environment }} runs-on: ubuntu-latest steps: - - name: Checkout Contrib Repo at SHA - ${{ github.sha }} + - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} uses: actions/checkout@v2 - - name: Checkout Core Repo @ tag v0.15b0 + - name: Checkout Core Repo @ SHA ${{ env.CORE_REPO_SHA }} uses: actions/checkout@v2 with: repository: open-telemetry/opentelemetry-python - ref: v0.15b0 + ref: ${{ env.CORE_REPO_SHA }} path: opentelemetry-python-core - name: Set up Python 3.8 uses: actions/setup-python@v2 diff --git a/README.md b/README.md index 720c5e70e4..24996a4197 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t 3. Activate your virtual env. `source my_test_venv/bin/activate`. 4. Clone the [OpenTelemetry Python](https://github.com/open-telemetry/opentelemetry-python) Python Core repo to a folder named `opentelemetry-python-core`. `git clone git@github.com:open-telemetry/opentelemetry-python.git opentelemetry-python-core`. 5. Change directory to the repo that was just cloned. `cd opentelemetry-python-core`. -6. Move the head of this repo to the hash you want your tests to use. This is currently the tag `v0.15b0` as seen in `.github/workflows/test.yml`. Use `git fetch --tags && git checkout v0.15b0`. +6. Move the head of this repo to the hash you want your tests to use. This is currently the SHA `47483865854c7adae7455f8441dab7f814f4ce2a` as seen in `.github/workflows/test.yml`. Use `git fetch && git checkout 47483865854c7adae7455f8441dab7f814f4ce2a`. 7. Go back to the root directory. `cd ../`. 8. Make sure you have `tox` installed. `pip install tox`. 9. Run tests for a package. (e.g. `tox -e test-instrumentation-flask`.)