Skip to content

Commit 6887bd9

Browse files
committed
Fix GitHub check_style CI
As previously configured, no runner was ever started by GitHub (perhaps because we were using ubuntu 20.04?).
1 parent 2ba8ca0 commit 6887bd9

File tree

4 files changed

+5
-27
lines changed

4 files changed

+5
-27
lines changed

.github/workflows/check_code_style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: ["ubuntu-20.04"]
21+
os: ["ubuntu-latest"]
2222

2323
steps:
2424
# We should checkout the repo with submodules

.github/workflows/pre-merge-checks.yml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,13 @@ on:
1010
jobs:
1111
run-tests:
1212
name: Run pre-merge checks
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414
env:
1515
GOOGLE_APPLICATION_CREDENTIALS: service_account_credentials.json
1616
steps:
17-
- name: Checkout reboot-dev/pyprotoc-plugin
18-
uses: actions/checkout@v2
17+
- uses: actions/checkout@v2
1918
with:
20-
# We don't need special credentials since this is a public repo
21-
# that only depends on other public repos.
2219
submodules: recursive
23-
- name: Install Python 3.10 and set it as the default
24-
# To set Python 3.10 as the default we use `update-alternatives`:
25-
# https://linux.die.net/man/8/update-alternatives
26-
# We must set `python3` in addition to `python` because Bazel knows and cares
27-
# about whether it's using python2 or python3, and will enforce its desire by
28-
# explicitly running the `python2` or `python3` command.
29-
run: |
30-
sudo apt-get update \
31-
&& DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends \
32-
curl gpg gpg-agent software-properties-common
33-
sudo add-apt-repository ppa:deadsnakes/ppa \
34-
&& sudo apt-get update \
35-
&& DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends \
36-
python3.10 \
37-
python3.10-dev \
38-
python3.10-venv
39-
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.10 1
40-
sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1
41-
python --version
42-
python3 --version
4320
- name: Set up read+write remote cache credentials (when on main)
4421
# With the exception of GITHUB_TOKEN, secrets are not passed to the runner
4522
# when a workflow is triggered from a forked repository. We can therefore

rules.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Defines rules to create pyprotoc-based bazel rules."""
2+
23
load("@com_google_protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
34

45
def _get_proto_sources(context):

0 commit comments

Comments
 (0)