Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade various things to newer versions.
Browse files Browse the repository at this point in the history
smolkaj committed Dec 14, 2024
1 parent a41e728 commit 03227d5
Showing 7 changed files with 13 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/any-branch-uploads.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ jobs:
if: ${{ github.repository == 'p4lang/p4runtime' }}
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build spec
run: |
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-madoko:latest make
12 changes: 3 additions & 9 deletions .github/workflows/ci-build-proto.yml
Original file line number Diff line number Diff line change
@@ -14,16 +14,16 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: [ubuntu-22.04, ubuntu-latest]
env:
BAZEL: bazelisk-linux-amd64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive

- name: Mount bazel cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
# See https://docs.bazel.build/versions/master/output_directories.html
path: "~/.cache/bazel"
@@ -33,12 +33,6 @@ jobs:
restore-keys: |
bazel-${{ runner.os }}-build-
- name: Install bazelisk
run: |
curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.15.0/$BAZEL"
chmod +x $BAZEL
sudo mv $BAZEL /usr/local/bin/bazel
- name: Build proto/
run: cd proto && bazel build //... && bazel test //...

2 changes: 1 addition & 1 deletion .github/workflows/codegen.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
check-codegen:
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Compile protobufs
run: |
docker build -t p4runtime-ci -f codegen/Dockerfile .
2 changes: 1 addition & 1 deletion .github/workflows/main-branch-uploads.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ jobs:
if: ${{ github.repository == 'p4lang/p4runtime' }}
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# fetch all history for all branches and tags
fetch-depth: 0
4 changes: 2 additions & 2 deletions .github/workflows/spec.yml
Original file line number Diff line number Diff line change
@@ -14,15 +14,15 @@ jobs:
madoko-lint:
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run linter
run: |
./tools/madokolint.py docs/v1/P4Runtime-Spec.mdk
build-spec:
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build spec
run: |
docker run -v `pwd`/docs/v1:/usr/src/p4-spec p4lang/p4rt-madoko:latest make
2 changes: 1 addition & 1 deletion .github/workflows/tag-uploads.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ jobs:
env:
TAG: ${{ github.ref_name }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# fetch all history for all branches and tags
fetch-depth: 0
7 changes: 4 additions & 3 deletions proto/.bazelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# bazelrc file
# Use C++17.
build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17

# C++14 required for recent gRPC versions
build --cxxopt='-std=c++14'
# Use Clang.
build --action_env=CC=clang,CXX=clang++

0 comments on commit 03227d5

Please sign in to comment.