Pass ci_fetch_deps.py the sha rather than ref

The remote ref may be out of date and not get the right branch
history in some cases. actions/checkout also fetches based on sha
This commit is contained in:
Scott Shawcroft 2021-12-07 15:57:06 -08:00
parent 574039391e
commit 981e3705b8
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
3 changed files with 6 additions and 6 deletions

View File

@ -35,7 +35,7 @@ jobs:
with: with:
python-version: 3.8 python-version: 3.8
- name: Get CP deps - name: Get CP deps
run: python tools/ci_fetch_deps.py test ${{ github.ref }} run: python tools/ci_fetch_deps.py test ${{ github.sha }}
- name: CircuitPython version - name: CircuitPython version
run: | run: |
git describe --dirty --tags || git log --parents HEAD~4.. git describe --dirty --tags || git log --parents HEAD~4..
@ -141,7 +141,7 @@ jobs:
with: with:
python-version: 3.8 python-version: 3.8
- name: Get CP deps - name: Get CP deps
run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.ref }} run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
- name: CircuitPython version - name: CircuitPython version
run: | run: |
git describe --dirty --tags git describe --dirty --tags
@ -197,7 +197,7 @@ jobs:
submodules: false submodules: false
fetch-depth: 1 fetch-depth: 1
- name: Get CP deps - name: Get CP deps
run: python tools/ci_fetch_deps.py docs ${{ github.ref }} run: python tools/ci_fetch_deps.py docs ${{ github.sha }}
- name: CircuitPython version - name: CircuitPython version
run: | run: |
git describe --dirty --tags git describe --dirty --tags
@ -269,7 +269,7 @@ jobs:
submodules: false submodules: false
fetch-depth: 1 fetch-depth: 1
- name: Get CP deps - name: Get CP deps
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.ref }} run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get install -y gettext sudo apt-get install -y gettext

View File

@ -25,7 +25,7 @@ jobs:
with: with:
python-version: 3.8 python-version: 3.8
- name: Get CP deps - name: Get CP deps
run: python tools/ci_fetch_deps.py website ${{ github.ref }} run: python tools/ci_fetch_deps.py website ${{ github.sha }}
- name: Install deps - name: Install deps
run: | run: |
pip install -r requirements-dev.txt pip install -r requirements-dev.txt

View File

@ -70,7 +70,7 @@ jobs:
submodules: false submodules: false
fetch-depth: 1 fetch-depth: 1
- name: Get CP deps - name: Get CP deps
run: python tools/ci_fetch_deps.py windows ${{ github.ref }} run: python tools/ci_fetch_deps.py windows ${{ github.sha }}
- name: CircuitPython version - name: CircuitPython version
run: | run: |
git describe --dirty --tags git describe --dirty --tags