Skip to content

Commit

Permalink
[github-actions] use ubuntu 22.04 (#491)
Browse files Browse the repository at this point in the history
* upgrade python version
* use setuptools==67.5.1
* use ubuntu-22.04
  • Loading branch information
simonlingoogle authored Mar 7, 2023
1 parent 1c7d3c1 commit c2c5fbb
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 1,609 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:

jobs:
cancel-previous-runs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
Expand All @@ -50,7 +50,7 @@ jobs:
fail-fast: false
matrix:
go: [ "1.17", "1.20" ]
os: [ ubuntu-20.04, macos-11 ]
os: [ ubuntu-22.04, macos-12 ]
steps:
- uses: actions/setup-go@v3
with:
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:

jobs:
cancel-previous-runs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
Expand All @@ -52,8 +52,8 @@ jobs:
fail-fast: false
matrix:
go: ["1.17", "1.20"]
python-version: [3.7]
os: [ubuntu-20.04]
python-version: ["3.9"]
os: [ubuntu-22.04]
steps:
- uses: actions/setup-go@v3
with:
Expand All @@ -66,4 +66,8 @@ jobs:
run: |
docker build -t otns-env -f etc/docker/environment/Dockerfile .
docker run -t -v$PWD:/otns otns-env -c "./script/pack-web"
git diff --quiet
if ! git diff --quiet; then
echo "script/pack-web was not properly executed:"
git diff
exit 1
fi
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:

jobs:
cancel-previous-runs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
Expand All @@ -45,7 +45,7 @@ jobs:

buildx:
name: buildx-${{ matrix.version }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:

jobs:
cancel-previous-runs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
Expand All @@ -45,7 +45,7 @@ jobs:

go-lint:
name: Go Lint
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/stress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:

jobs:
cancel-previous-runs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
Expand All @@ -48,10 +48,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7]
python-version: ["3.9"]
go-version: ["1.20"]
suite: ["network-forming", "commissioning", "connectivity", "network-latency", "multicast-performance", "otns-performance", "network-limits"]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:

jobs:
cancel-previous-runs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
Expand All @@ -49,7 +49,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-11]
os: [ubuntu-22.04, macos-12]
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
Expand All @@ -69,8 +69,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7]
os: [ubuntu-20.04, macos-11]
python-version: ["3.9"]
os: [ubuntu-22.04, macos-12]
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
Expand All @@ -92,8 +92,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7]
os: [ubuntu-20.04, macos-11]
python-version: ["3.9"]
os: [ubuntu-22.04, macos-12]
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
Expand All @@ -115,8 +115,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7]
os: [ubuntu-20.04, macos-11]
python-version: ["3.9"]
os: [ubuntu-22.04, macos-12]
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
Expand Down
1,689 changes: 105 additions & 1,584 deletions pylibs/otns/proto/visualize_grpc_pb2.py

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pylibs/unittests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
grpcio-tools==1.31.0
grpcio==1.31.0
grpcio-tools==1.46.3
grpcio==1.46.3
protobuf==3.15.0
wheel==0.38.1
2 changes: 1 addition & 1 deletion script/install-deps
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ install_grpcwebproxy()

install_python_libs()
{
python3 -m pip install --user setuptools wheel
python3 -m pip install --user setuptools==67.5.1 wheel
}

main()
Expand Down
2 changes: 1 addition & 1 deletion script/setup-dev
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
PROTOBUF_VERSION=3.19.4
PROTOC_GEN_GO_VERSION=1.5.2
PROTO_GEN_GRPC_WEB_VERSION=1.3.1
GRPCIO_TOOLS_VERSION=1.43.0
GRPCIO_TOOLS_VERSION=1.46.3
GO_BINDATA_VERSION=3.0.7

skip_update='true'
Expand Down

0 comments on commit c2c5fbb

Please sign in to comment.