Skip to content

Commit

Permalink
Merge branch 'master' into operator-api-authz
Browse files Browse the repository at this point in the history
  • Loading branch information
dapr-bot committed Jan 4, 2024
2 parents 69f70bd + 70e3f69 commit dd0dd29
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/minor-patch-release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
name: Minor Patch Release
about: Minor Patch Release
title: 'Minor Patch Release Checklist'
labels: kind/bug
assignees: ''
---

- [ ] Dapr maintainer(s) communicate out the discovery of issues that require a patch release and the reason why to the Discord Maintainers and Release channels. Patch releases are made for one of categories below:
- [ ] Security vulnerability
- <>
Expand Down
7 changes: 4 additions & 3 deletions .github/scripts/check_go_mod.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

import { readFile } from 'node:fs/promises'

const match = `// Uncomment for local development for testing with changes in the components-contrib repository.
const match = `// Uncomment for local development for testing with changes in the components-contrib && kit repositories.
// Don't commit with this uncommented!
//
// replace github.com/dapr/components-contrib => ../components-contrib
// replace github.com/dapr/kit => ../kit
//
// Then, run \`make modtidy\` in this repository.
// This ensures that go.mod and go.sum are up-to-date.`
// Then, run \`make modtidy-all\` in this repository.
// This ensures that go.mod and go.sum are up-to-date for each go.mod file.`

const read = await readFile('go.mod', { encoding: 'utf8' })
if (!read.includes(match)) {
Expand Down
7 changes: 4 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,11 @@ replace (
// check for retracted versions: go list -mod=mod -f '{{if .Retracted}}{{.}}{{end}}' -u -m all
replace github.com/microcosm-cc/bluemonday => github.com/microcosm-cc/bluemonday v1.0.24

// Uncomment for local development for testing with changes in the components-contrib repository.
// Uncomment for local development for testing with changes in the components-contrib && kit repositories.
// Don't commit with this uncommented!
//
// replace github.com/dapr/components-contrib => ../components-contrib
// replace github.com/dapr/kit => ../kit
//
// Then, run `make modtidy` in this repository.
// This ensures that go.mod and go.sum are up-to-date.
// Then, run `make modtidy-all` in this repository.
// This ensures that go.mod and go.sum are up-to-date for each go.mod file.

0 comments on commit dd0dd29

Please sign in to comment.