Skip to content

Commit d6e3834

Browse files
authored
Merge pull request #1976 from dhalbert/ubuntu-latest
Use ubuntu-latest and Python 3.x for CI runs
2 parents 589c15d + 87a3908 commit d6e3834

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/githubci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
fail-fast: false
99
matrix:
1010
arduino-platform: ["cpb", "cpc", "cpx_ada", "esp32", "esp8266", "feather32u4", "feather_m0_express", "feather_m4_express", "feather_rp2040", "flora", "funhouse", "gemma", "gemma_m0", "hallowing_m0", "hallowing_m4_tinyusb", "magtag", "metro_m0", "metro_m0_tinyusb", "metro_m4", "metro_m4_tinyusb", "monster_m4sk", "monster_m4sk_tinyusb", "neokeytrinkey_m0", "neotrellis_m4", "nrf52832", "nrf52840", "protrinket_5v", "proxlighttrinkey_m0", "pybadge", "pygamer", "pyportal", "qt2040_trinkey", "qtpy_m0", "qtpy_esp32s2", "rotarytrinkey_m0", "slidetrinkey_m0", "trinket_m0", "uno", "trinket_5v", "ledglasses_nrf52840" ]
11-
runs-on: ubuntu-18.04
11+
runs-on: ubuntu-latest
1212

1313
steps:
1414
- uses: actions/setup-python@v2
1515
with:
16-
python-version: '3.8'
16+
python-version: "3.x"
1717
- uses: actions/checkout@v2
1818
- uses: actions/checkout@v2
1919
with:
@@ -72,10 +72,10 @@ jobs:
7272
pylint:
7373
runs-on: ubuntu-latest
7474
steps:
75-
- name: Set up Python 3.6
75+
- name: Set up Python 3.x
7676
uses: actions/setup-python@v1
7777
with:
78-
python-version: 3.6
78+
python-version: "3.x"
7979
- name: Versions
8080
run: |
8181
python3 --version

.github/workflows/images.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313

1414
jobs:
1515
update-images:
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1717
steps:
1818
- name: Dump GitHub context
1919
env:
@@ -22,10 +22,10 @@ jobs:
2222

2323
- uses: actions/[email protected]
2424

25-
- name: Set up Python 3.9
25+
- name: Set up Python 3.x
2626
uses: actions/setup-python@v1
2727
with:
28-
python-version: 3.9
28+
python-version: "3.x"
2929

3030
- name: Checkout screenshot maker
3131
run: git clone --depth=1 https://github.com/circuitpython/CircuitPython_Library_Screenshot_Maker
@@ -49,4 +49,3 @@ jobs:
4949
git add *.png index.html
5050
git remote add origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
5151
if git commit -m"update images"; then git push -f origin HEAD:folder-images; fi
52-

0 commit comments

Comments
 (0)