Skip to content

Commit cbfa409

Browse files
committed
CI: Update to Python 3.6, bump actions versions
Python 3.5 is no longer supported by GitHub Actions. While at it, bump the "setup-python" and "cache" actions to v2, and simplify the Windows build to use less third party actions.
1 parent 0058a19 commit cbfa409

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
libegl1-mesa-dev libxml2-dev libxslt1-dev libyaml-dev llvm-dev \
1818
libclang-dev libglib2.0-dev ninja-build
1919
- name: Setup Python
20-
uses: actions/setup-python@v1
20+
uses: actions/setup-python@v2
2121
with:
22-
python-version: 3.5
22+
python-version: 3.6
2323
- name: Python Package Cache
24-
uses: actions/cache@v1
24+
uses: actions/cache@v2
2525
with:
2626
path: ~/.cache/pip
2727
key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/ci.yml') }}
@@ -102,20 +102,26 @@ jobs:
102102
- name: Checkout
103103
uses: actions/checkout@v2
104104
- name: Setup Python
105-
uses: actions/setup-python@v1
105+
uses: actions/setup-python@v2
106+
with:
107+
python-version: 3.6
106108
- name: Setup MSVC
107109
uses: seanmiddleditch/gha-setup-vsdevenv@master
108-
- name: Install Bison
110+
- name: Install Tools
109111
run: |
110-
choco install winflexbison3 -y --no-progress --stop-on-first-failure
111-
- name: Build
112-
uses: BSFishy/[email protected]
113-
with:
114-
action: build
115-
meson-version: 0.56.0
116-
setup-options: >-
117-
-Dbuild-docs=false
118-
-Dlibxkbcommon:enable-docs=false
119-
-Dlibxkbcommon:enable-wayland=false
120-
-Dlibxkbcommon:enable-x11=false
121-
-Dlibxkbcommon:enable-xkbregistry=false
112+
choco install winflexbison3 ninja -y --no-progress --stop-on-first-failure
113+
- name: Install Python Packages
114+
run: |
115+
python -m pip install --upgrade pip setuptools wheel
116+
python -m pip install meson==0.56
117+
- name: Meson - Configure
118+
run: >+
119+
meson _build
120+
-Dbuild-docs=false
121+
-Dlibxkbcommon:enable-docs=false
122+
-Dlibxkbcommon:enable-wayland=false
123+
-Dlibxkbcommon:enable-x11=false
124+
-Dlibxkbcommon:enable-xkbregistry=false
125+
- name: Meson - Build
126+
run: |
127+
ninja -C _build

0 commit comments

Comments
 (0)