Skip to content

Commit

Permalink
Merge branch 'main' into revert-machine-part-id
Browse files Browse the repository at this point in the history
  • Loading branch information
abe-winter authored Apr 17, 2024
2 parents bf997ce + 1c4037e commit 276537b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: PR Test Label Manager

on:
pull_request:
pull_request_target:
branches: [ main ]
types: [ opened, synchronize, reopened ]

jobs:
pr_test_label_manager:
# note: this doesn't check 'safe to test' label because it doesn't check out code
# note: this doesn't gate on 'safe to test' label because it doesn't check out code
name: PR Test Label Manager
runs-on: ubuntu-latest
steps:
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/tag_and_release_protos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ on:
jobs:
bump-tag:
if: github.repository_owner == 'viamrobotics'
runs-on: [self-hosted, x64]
container:
image: ghcr.io/viamrobotics/canon:amd64-cache
options: --platform linux/amd64
runs-on: ubuntu-latest
container: ghcr.io/viamrobotics/canon:amd64
outputs:
new_tag: ${{ steps.bump.outputs.new_tag }}
steps:
Expand All @@ -37,9 +35,8 @@ jobs:
buf-push:
needs: bump-tag
if: github.repository_owner == 'viamrobotics'
runs-on: [self-hosted, x64]
container:
image: ghcr.io/viamrobotics/canon:amd64-cache
runs-on: ubuntu-latest
container: ghcr.io/viamrobotics/canon:amd64
steps:
- uses: actions/checkout@v3
- uses: bufbuild/buf-setup-action@v1
Expand All @@ -52,9 +49,8 @@ jobs:
dispatch:
needs: buf-push
if: github.repository_owner == 'viamrobotics'
runs-on: [self-hosted, x64]
container:
image: ghcr.io/viamrobotics/canon:amd64
runs-on: ubuntu-latest
container: ghcr.io/viamrobotics/canon:amd64
strategy:
matrix:
repo:
Expand Down

0 comments on commit 276537b

Please sign in to comment.