1010 # Otherwise, set variable to the commit of your branch on
1111 # opentelemetry-python-contrib which is compatible with these Core repo
1212 # changes.
13- CONTRIB_REPO_SHA : 2a92e255f7595024242e45c0050c8f3de7140b6b
13+ CONTRIB_REPO_SHA : dde62cebffe519c35875af6d06fae053b3be65ec
1414
1515jobs :
1616 build :
@@ -20,15 +20,15 @@ jobs:
2020 py37 : 3.7
2121 py38 : 3.8
2222 py39 : 3.9
23- pypy3 : pypy3
23+ pypy3 : pypy-3.7
2424 RUN_MATRIX_COMBINATION : ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
2525 runs-on : ${{ matrix.os }}
2626 strategy :
2727 fail-fast : false # ensures the entire test matrix is run, even if one permutation fails
2828 matrix :
2929 python-version : [ py36, py37, py38, py39, pypy3 ]
3030 package : ["instrumentation", "core", "exporter", "propagator"]
31- os : [ ubuntu-latest ]
31+ os : [ ubuntu-20.04, windows-2019 ]
3232 steps :
3333 - name : Checkout Core Repo @ SHA - ${{ github.sha }}
3434 uses : actions/checkout@v2
@@ -42,14 +42,22 @@ jobs:
4242 uses : actions/setup-python@v2
4343 with :
4444 python-version : ${{ env[matrix.python-version] }}
45+ architecture : ' x64'
4546 - name : Install tox
4647 run : pip install -U tox-factor
4748 - name : Cache tox environment
4849 # Preserves .tox directory between runs for faster installs
4950 uses : actions/cache@v2
5051 with :
51- path : .tox
52- key : tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
52+ path : |
53+ .tox
54+ ~/.cache/pip
55+ key : v2-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
56+ # tox fails on windows and Python3.6 when tox dir is reused between builds so we remove it
57+ - name : fix for windows + py3.6
58+ if : ${{ matrix.os == 'windows-2019' && matrix.python-version == 'py36' }}
59+ shell : pwsh
60+ run : Remove-Item .\.tox\ -Force -Recurse -ErrorAction Ignore
5361 - name : run tox
5462 run : tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json
5563 - name : Find and merge benchmarks
8189 matrix :
8290 tox-environment : [ "docker-tests", "lint", "docs", "mypy", "mypyinstalled", "tracecontext" ]
8391 name : ${{ matrix.tox-environment }}
84- runs-on : ubuntu-latest
92+ runs-on : ubuntu-20.04
8593 steps :
8694 - name : Checkout Core Repo @ SHA - ${{ github.sha }}
8795 uses : actions/checkout@v2
@@ -95,14 +103,17 @@ jobs:
95103 uses : actions/setup-python@v2
96104 with :
97105 python-version : 3.9
106+ architecture : ' x64'
98107 - name : Install tox
99108 run : pip install -U tox
100109 - name : Cache tox environment
101110 # Preserves .tox directory between runs for faster installs
102111 uses : actions/cache@v2
103112 with :
104- path : .tox
105- key : tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
113+ path : |
114+ .tox
115+ ~/.cache/pip
116+ key : v2-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
106117 - name : run tox
107118 run : tox -e ${{ matrix.tox-environment }}
108119 contrib-build :
@@ -119,7 +130,7 @@ jobs:
119130 matrix :
120131 python-version : [ py36, py37, py38, py39, pypy3 ]
121132 package : ["instrumentation", "exporter"]
122- os : [ ubuntu-latest ]
133+ os : [ ubuntu-20.04 ]
123134 steps :
124135 - name : Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
125136 uses : actions/checkout@v2
@@ -135,14 +146,17 @@ jobs:
135146 uses : actions/setup-python@v2
136147 with :
137148 python-version : ${{ env[matrix.python-version] }}
149+ architecture : ' x64'
138150 - name : Install tox
139151 run : pip install -U tox-factor
140152 - name : Cache tox environment
141153 # Preserves .tox directory between runs for faster installs
142154 uses : actions/cache@v2
143155 with :
144- path : .tox
145- key : tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
156+ path : |
157+ .tox
158+ ~/.cache/pip
159+ key : v2-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
146160 - name : run tox
147161 run : tox -f ${{ matrix.python-version }}-${{ matrix.package }}
148162 contrib-misc :
@@ -151,7 +165,7 @@ jobs:
151165 matrix :
152166 tox-environment : [ "docker-tests"]
153167 name : ${{ matrix.tox-environment }}
154- runs-on : ubuntu-latest
168+ runs-on : ubuntu-20.04
155169 steps :
156170 - name : Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
157171 uses : actions/checkout@v2
@@ -167,13 +181,16 @@ jobs:
167181 uses : actions/setup-python@v2
168182 with :
169183 python-version : 3.9
184+ architecture : ' x64'
170185 - name : Install tox
171186 run : pip install -U tox
172187 - name : Cache tox environment
173188 # Preserves .tox directory between runs for faster installs
174189 uses : actions/cache@v2
175190 with :
176- path : .tox
177- key : tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
191+ path : |
192+ .tox
193+ ~/.cache/pip
194+ key : v2-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
178195 - name : run tox
179196 run : tox -e ${{ matrix.tox-environment }}
0 commit comments