Skip to content

Commit 3540dd6

Browse files
committed
Update bufbuild GitHub Actions
1 parent fd19e4c commit 3540dd6

File tree

6 files changed

+48
-52
lines changed

6 files changed

+48
-52
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ jobs:
1616
- name: Checkout code
1717
uses: actions/checkout@v4
1818

19-
- name: Setup Buf
20-
uses: bufbuild/[email protected]
21-
with:
22-
github_token: ${{ github.token }}
23-
2419
- name: Push to schema registry
25-
uses: bufbuild/buf-push-[email protected]
20+
uses: bufbuild/[email protected]
2621
with:
27-
buf_token: ${{ secrets.BUF_TOKEN }}
22+
github_token: ${{ github.token }}
23+
token: ${{ secrets.BUF_TOKEN }}
24+
push: true

.github/workflows/create_tag.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ jobs:
5858
token: ${{ github.token }}
5959

6060
- name: Setup Buf
61-
uses: bufbuild/buf-setup-action@v1.30.0
61+
uses: bufbuild/buf-action@v1.2.0
6262
with:
6363
github_token: ${{ github.token }}
64+
token: ${{ secrets.BUF_TOKEN }}
65+
setup_only: true
6466

6567
- name: Push to schema registry
66-
# uses: bufbuild/buf-push-action@v1
67-
# with:
68-
# buf_token: ${{ secrets.BUF_TOKEN }}
68+
env:
69+
BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
6970
run: |
70-
export BUF_TOKEN=${{ secrets.BUF_TOKEN }}
7171
buf push --tag ${{ steps.version.outputs.NEW_VERSION }}

.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Setup Buf
20-
uses: bufbuild/buf-setup-action@v1.30.0
20+
uses: bufbuild/buf-action@v1.2.0
2121
with:
2222
github_token: ${{ github.token }}
23+
token: ${{ secrets.BUF_TOKEN }}
24+
setup_only: true
2325

2426
- name: Push to schema registry
25-
# uses: bufbuild/buf-push-action@v1
26-
# with:
27-
# buf_token: ${{ secrets.BUF_TOKEN }}
27+
env:
28+
BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
2829
run: |
29-
export BUF_TOKEN=${{ secrets.BUF_TOKEN }}
3030
buf push --tag ${{ github.ref_name }}

.github/workflows/pull_request.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: pull-request
22

33
permissions:
44
contents: read
5+
pull-requests: write
56

67
on: pull_request
78
jobs:
@@ -12,17 +13,11 @@ jobs:
1213
- name: Checkout code
1314
uses: actions/checkout@v4
1415

15-
- name: Setup Buf
16-
uses: bufbuild/buf-setup-action@v1.30.0
16+
- name: Buf PR Checks
17+
uses: bufbuild/buf-action@v1.2.0
1718
with:
1819
github_token: ${{ github.token }}
19-
20-
- name: Lint
21-
uses: bufbuild/[email protected]
22-
23-
- name: Push to schema registry
24-
uses: bufbuild/[email protected]
25-
if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
26-
with:
27-
buf_token: ${{ secrets.BUF_TOKEN }}
28-
draft: ${{ github.ref_name != 'master'}}
20+
token: ${{ secrets.BUF_TOKEN }}
21+
format: true
22+
lint: true
23+
breaking: true

meshtastic/admin.proto

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ package meshtastic;
55
import "meshtastic/channel.proto";
66
import "meshtastic/config.proto";
77
import "meshtastic/connection_status.proto";
8+
import "meshtastic/device_ui.proto";
89
import "meshtastic/mesh.proto";
910
import "meshtastic/module_config.proto";
10-
import "meshtastic/device_ui.proto";
1111

1212
option csharp_namespace = "Meshtastic.Protobufs";
1313
option go_package = "github.com/meshtastic/go/generated";
@@ -21,7 +21,6 @@ option swift_prefix = "";
2121
* (Prior to 1.2 these operations were done via special ToRadio operations)
2222
*/
2323
message AdminMessage {
24-
2524
/*
2625
* The node generates this key and sends it with any get_x_response packets.
2726
* The client MUST include the same key with any set_x commands. Key expires after 300 seconds.
@@ -529,18 +528,17 @@ message SharedContact {
529528
bool should_ignore = 3;
530529
}
531530

532-
/*
533-
* This message is used by a client to initiate or complete a key verification
534-
*/
531+
/*
532+
* This message is used by a client to initiate or complete a key verification
533+
*/
535534
message KeyVerificationAdmin {
536535
/*
537536
* Three stages of this request.
538537
*/
539538
enum MessageType {
540-
541539
/*
542-
* This is the first stage, where a client initiates
543-
*/
540+
* This is the first stage, where a client initiates
541+
*/
544542
INITIATE_VERIFICATION = 0;
545543

546544
/*
@@ -549,32 +547,32 @@ message KeyVerificationAdmin {
549547
*/
550548
PROVIDE_SECURITY_NUMBER = 1;
551549

552-
/*
553-
* Once the user has compared the verification message, this message notifies the node.
554-
*/
550+
/*
551+
* Once the user has compared the verification message, this message notifies the node.
552+
*/
555553
DO_VERIFY = 2;
556554

557-
/*
558-
* This is the cancel path, can be taken at any point
559-
*/
555+
/*
556+
* This is the cancel path, can be taken at any point
557+
*/
560558
DO_NOT_VERIFY = 3;
561559

562560
}
563561

564562
MessageType message_type = 1;
565563

566-
/*
567-
* The nodenum we're requesting
568-
*/
564+
/*
565+
* The nodenum we're requesting
566+
*/
569567
uint32 remote_nodenum = 2;
570568

571-
/*
572-
* The nonce is used to track the connection
573-
*/
569+
/*
570+
* The nonce is used to track the connection
571+
*/
574572
uint64 nonce = 3;
575573

576-
/*
577-
* The 4 digit code generated by the remote node, and communicated outside the mesh
578-
*/
574+
/*
575+
* The 4 digit code generated by the remote node, and communicated outside the mesh
576+
*/
579577
optional uint32 security_number = 4;
580578
}

renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended"
5+
]
6+
}

0 commit comments

Comments
 (0)