Skip to content

Commit

Permalink
Merge branch 'main' into lovro/pipeline-recovery-design-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
hariso authored Aug 14, 2024
2 parents b12dd4d + 891178b commit c3a8211
Show file tree
Hide file tree
Showing 12 changed files with 304 additions and 317 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/buf-push.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: buf-push

on:
push:
branches:
- main
paths:
- 'proto/**'

jobs:
push:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

# This step sets up the variable steps.buf-version.outputs.v
# to contain the version of Buf (e.g. v1.36.0) from go.mod.
- name: Get Buf version
id: buf-version
run: |
BUF_VERSION=$( go list -m -f '{{.Version}}' github.com/bufbuild/buf )
# remove the leading 'v' in front of the version
BUF_VERSION=${BUF_VERSION#v}
echo "v=$BUF_VERSION" >> "$GITHUB_OUTPUT"
- uses: bufbuild/buf-action@v1
with:
version: ${{ steps.buf-version.outputs.v }}
token: ${{ secrets.BUF_TOKEN }}
input: 'proto'
# The repository should already exist.
# If it can be automatically created, that's a sign that it was deleted,
# which is likely a major issue, which we want to be aware of.
push_disable_create: true
27 changes: 27 additions & 0 deletions .github/workflows/buf-update.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Run 'buf update'"

on:
workflow_dispatch:
schedule:
- cron: '30 10 * * 1'

jobs:
update-buf-dependencies:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@v4

- name: Run 'buf update'
run: |
export PATH=$PATH:$(go env GOPATH)/bin
make install-tools proto-update
- name: Create pull request
uses: peter-evans/[email protected]
with:
title: Update Buf dependencies
body: Automatic pull request for updating Buf dependencies
branch: update-buf-dependencies
commit-message: "[automated] Update Buf dependencies"
33 changes: 33 additions & 0 deletions .github/workflows/buf-validate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: buf-validate

on:
pull_request:
# 'labeled' and 'unlabeled' are included so we can use the 'Buf Skip Breaking' label
# and skip a breaking change if that's required.
# See: https://github.com/bufbuild/buf-action?tab=readme-ov-file#skip-the-breaking-change-detection-step
types: [opened, synchronize, reopened, labeled, unlabeled]
paths:
- 'proto/**'

jobs:
validate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

# This step sets up the variable steps.buf-version.outputs.v
# to contain the version of Buf (e.g. v1.36.0) from go.mod.
- name: Get Buf version
id: buf-version
run: |
BUF_VERSION=$( go list -m -f '{{.Version}}' github.com/bufbuild/buf )
# remove the leading 'v' in front of the version
BUF_VERSION=${BUF_VERSION#v}
echo "v=$BUF_VERSION" >> "$GITHUB_OUTPUT"
- uses: bufbuild/buf-action@v1
with:
version: ${{ steps.buf-version.outputs.v }}
token: ${{ secrets.BUF_TOKEN }}
input: 'proto'
push: false
breaking_against: '${{ github.event.repository.clone_url }}#branch=main,subdir=proto'
45 changes: 0 additions & 45 deletions .github/workflows/buf.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
org.opencontainers.image.vendor=ConduitIO
- name: Build and push Docker image
uses: docker/build-push-action@v6.6.1
uses: docker/build-push-action@v6.7.0
with:
context: .
push: true
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/validate-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
go-version-file: 'go.mod'

- name: Check generated files
env:
BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
run: |
export PATH=$PATH:$(go env GOPATH)/bin
make install-tools generate proto-generate
Expand Down
23 changes: 11 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require (
github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c
github.com/gammazero/deque v0.2.1
github.com/goccy/go-json v0.10.3
github.com/golangci/golangci-lint v1.59.1
github.com/golangci/golangci-lint v1.60.1
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.3
Expand Down Expand Up @@ -69,8 +69,8 @@ require (
github.com/Antonboom/nilnil v0.1.9 // indirect
github.com/Antonboom/testifylint v1.4.3 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/Crocmagnon/fatcontext v0.3.0 // indirect
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
github.com/Crocmagnon/fatcontext v0.4.0 // indirect
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
Expand Down Expand Up @@ -134,7 +134,7 @@ require (
github.com/dlclark/regexp2 v1.11.4 // indirect
github.com/docker/cli v26.1.4+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v27.1.0+incompatible // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
Expand Down Expand Up @@ -163,7 +163,7 @@ require (
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gofrs/flock v0.12.1 // indirect
github.com/gofrs/uuid/v5 v5.2.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.2.1 // indirect
Expand Down Expand Up @@ -232,7 +232,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mgechev/revive v1.3.7 // indirect
github.com/mgechev/revive v1.3.9 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
Expand All @@ -242,7 +242,7 @@ require (
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/moricho/tparallel v0.3.1 // indirect
github.com/moricho/tparallel v0.3.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nakabonne/nestif v0.3.1 // indirect
Expand All @@ -261,7 +261,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/profile v1.7.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/polyfloyd/go-errorlint v1.5.2 // indirect
github.com/polyfloyd/go-errorlint v1.6.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/quasilyte/go-ruleguard v0.4.2 // indirect
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
Expand All @@ -272,7 +272,7 @@ require (
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rs/cors v1.11.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryancurrah/gomodguard v1.3.2 // indirect
github.com/ryancurrah/gomodguard v1.3.3 // indirect
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
Expand Down Expand Up @@ -300,7 +300,6 @@ require (
github.com/stretchr/objx v0.5.2 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
github.com/tdakkota/asciicheck v0.2.0 // indirect
github.com/tetafro/godot v1.4.16 // indirect
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a // indirect
Expand All @@ -311,7 +310,7 @@ require (
github.com/twmb/franz-go/pkg/kmsg v1.8.0 // indirect
github.com/ultraware/funlen v0.1.0 // indirect
github.com/ultraware/whitespace v0.1.1 // indirect
github.com/uudashr/gocognit v1.1.2 // indirect
github.com/uudashr/gocognit v1.1.3 // indirect
github.com/vbatts/tar-split v0.11.5 // indirect
github.com/xen0n/gosmopolitan v1.2.2 // indirect
github.com/xitongsys/parquet-go v1.6.2 // indirect
Expand Down Expand Up @@ -347,7 +346,7 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
honnef.co/go/tools v0.4.7 // indirect
honnef.co/go/tools v0.5.0 // indirect
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
modernc.org/libc v1.55.3 // indirect
modernc.org/mathutil v1.6.0 // indirect
Expand Down
Loading

0 comments on commit c3a8211

Please sign in to comment.