From 4c9c159f1bb9ba891b04a1e494f032ae71a57de0 Mon Sep 17 00:00:00 2001 From: Charith Ellawala Date: Tue, 9 Apr 2024 07:31:08 +0100 Subject: [PATCH 1/3] chore(version): Bump version to 0.36.0 Signed-off-by: Charith Ellawala --- deploy/charts/cerbos/Chart.yaml | 4 ++-- docs/antora-playbook.yml | 2 +- docs/antora.yml | 3 ++- npm/packages/cerbos-darwin-arm64/package.json | 2 +- npm/packages/cerbos-darwin-x64/package.json | 2 +- npm/packages/cerbos-linux-arm64/package.json | 2 +- npm/packages/cerbos-linux-x64/package.json | 2 +- npm/packages/cerbos/package.json | 10 +++++----- npm/packages/cerbosctl-darwin-arm64/package.json | 2 +- npm/packages/cerbosctl-darwin-x64/package.json | 2 +- npm/packages/cerbosctl-linux-arm64/package.json | 2 +- npm/packages/cerbosctl-linux-x64/package.json | 2 +- npm/packages/cerbosctl/package.json | 10 +++++----- 13 files changed, 23 insertions(+), 22 deletions(-) diff --git a/deploy/charts/cerbos/Chart.yaml b/deploy/charts/cerbos/Chart.yaml index a2305c5c0c..33ab3e7195 100644 --- a/deploy/charts/cerbos/Chart.yaml +++ b/deploy/charts/cerbos/Chart.yaml @@ -16,6 +16,6 @@ keywords: - policies - rbac - security -version: "0.35.0" -appVersion: "0.35.0" +version: "0.36.0" +appVersion: "0.36.0" kubeVersion: ">=1.23.0-0" diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml index 9db7a2f550..ede7c92a3f 100644 --- a/docs/antora-playbook.yml +++ b/docs/antora-playbook.yml @@ -21,7 +21,7 @@ urls: asciidoc: attributes: app-name: "cerbos" - app-version: "0.35.0@" + app-version: "0.36.0@" experimental: true page-pagination: true extensions: diff --git a/docs/antora.yml b/docs/antora.yml index 25be7d9e5e..69de1f7441 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,7 +1,8 @@ --- name: cerbos title: Cerbos -version: "0.35.0" +version: "0.36.0" +prerelease: -prerelease nav: - modules/ROOT/nav.adoc - modules/api/nav.adoc diff --git a/npm/packages/cerbos-darwin-arm64/package.json b/npm/packages/cerbos-darwin-arm64/package.json index 8f6642acd5..7adb1bb74f 100644 --- a/npm/packages/cerbos-darwin-arm64/package.json +++ b/npm/packages/cerbos-darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbos-darwin-arm64", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The darwin-arm64 binary for cerbos", "repository": { "type": "git", diff --git a/npm/packages/cerbos-darwin-x64/package.json b/npm/packages/cerbos-darwin-x64/package.json index 00a91c422a..2407ea0312 100644 --- a/npm/packages/cerbos-darwin-x64/package.json +++ b/npm/packages/cerbos-darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbos-darwin-x64", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The darwin-x64 binary for cerbos", "repository": { "type": "git", diff --git a/npm/packages/cerbos-linux-arm64/package.json b/npm/packages/cerbos-linux-arm64/package.json index 34050b27f6..33c53c6862 100644 --- a/npm/packages/cerbos-linux-arm64/package.json +++ b/npm/packages/cerbos-linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbos-linux-arm64", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The linux-arm64 binary for cerbos", "repository": { "type": "git", diff --git a/npm/packages/cerbos-linux-x64/package.json b/npm/packages/cerbos-linux-x64/package.json index 00fc26bbed..a30c23948e 100644 --- a/npm/packages/cerbos-linux-x64/package.json +++ b/npm/packages/cerbos-linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbos-linux-x64", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The linux-x64 binary for cerbos", "repository": { "type": "git", diff --git a/npm/packages/cerbos/package.json b/npm/packages/cerbos/package.json index b58837e6a0..6b2b094497 100644 --- a/npm/packages/cerbos/package.json +++ b/npm/packages/cerbos/package.json @@ -1,6 +1,6 @@ { "name": "cerbos", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The cerbos binary", "repository": { "type": "git", @@ -36,9 +36,9 @@ ], "scripts": {}, "optionalDependencies": { - "@cerbos/cerbos-darwin-arm64": "0.35.0", - "@cerbos/cerbos-darwin-x64": "0.35.0", - "@cerbos/cerbos-linux-arm64": "0.35.0", - "@cerbos/cerbos-linux-x64": "0.35.0" + "@cerbos/cerbos-darwin-arm64": "0.36.0-prerelease", + "@cerbos/cerbos-darwin-x64": "0.36.0-prerelease", + "@cerbos/cerbos-linux-arm64": "0.36.0-prerelease", + "@cerbos/cerbos-linux-x64": "0.36.0-prerelease" } } diff --git a/npm/packages/cerbosctl-darwin-arm64/package.json b/npm/packages/cerbosctl-darwin-arm64/package.json index f352bd133b..8ac1d3e73d 100644 --- a/npm/packages/cerbosctl-darwin-arm64/package.json +++ b/npm/packages/cerbosctl-darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbosctl-darwin-arm64", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The darwin-arm64 binary for cerbosctl", "repository": { "type": "git", diff --git a/npm/packages/cerbosctl-darwin-x64/package.json b/npm/packages/cerbosctl-darwin-x64/package.json index 32755ea8ee..42f12545a5 100644 --- a/npm/packages/cerbosctl-darwin-x64/package.json +++ b/npm/packages/cerbosctl-darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbosctl-darwin-x64", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The darwin-x64 binary for cerbosctl", "repository": { "type": "git", diff --git a/npm/packages/cerbosctl-linux-arm64/package.json b/npm/packages/cerbosctl-linux-arm64/package.json index ca58fdc0a2..13f3e651dc 100644 --- a/npm/packages/cerbosctl-linux-arm64/package.json +++ b/npm/packages/cerbosctl-linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbosctl-linux-arm64", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The linux-arm64 binary for cerbosctl", "repository": { "type": "git", diff --git a/npm/packages/cerbosctl-linux-x64/package.json b/npm/packages/cerbosctl-linux-x64/package.json index 19c0ebace5..ec72e46be9 100644 --- a/npm/packages/cerbosctl-linux-x64/package.json +++ b/npm/packages/cerbosctl-linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbosctl-linux-x64", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The linux-x64 binary for cerbosctl", "repository": { "type": "git", diff --git a/npm/packages/cerbosctl/package.json b/npm/packages/cerbosctl/package.json index 69acb86be6..b9a6ddcb24 100644 --- a/npm/packages/cerbosctl/package.json +++ b/npm/packages/cerbosctl/package.json @@ -1,6 +1,6 @@ { "name": "cerbosctl", - "version": "0.35.0", + "version": "0.36.0-prerelease", "description": "The cerbosctl binary", "repository": { "type": "git", @@ -36,9 +36,9 @@ ], "scripts": {}, "optionalDependencies": { - "@cerbos/cerbosctl-darwin-arm64": "0.35.0", - "@cerbos/cerbosctl-darwin-x64": "0.35.0", - "@cerbos/cerbosctl-linux-arm64": "0.35.0", - "@cerbos/cerbosctl-linux-x64": "0.35.0" + "@cerbos/cerbosctl-darwin-arm64": "0.36.0-prerelease", + "@cerbos/cerbosctl-darwin-x64": "0.36.0-prerelease", + "@cerbos/cerbosctl-linux-arm64": "0.36.0-prerelease", + "@cerbos/cerbosctl-linux-x64": "0.36.0-prerelease" } } From e5b322b45c4328519a41ffc0a196cff59c336759 Mon Sep 17 00:00:00 2001 From: Charith Ellawala Date: Tue, 9 Apr 2024 08:31:16 +0100 Subject: [PATCH 2/3] chore(ci): Output signature from cosign (#2089) GoReleaser is hard-coded to look for a `.sig` file for each artifact. Signed-off-by: Charith Ellawala Signed-off-by: Charith Ellawala --- .github/workflows/release.yaml | 1 + .goreleaser.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2cbef96c6b..de8ec4b979 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,6 +1,7 @@ --- name: Release on: + workflow_dispatch: push: tags: - v* diff --git a/.goreleaser.yml b/.goreleaser.yml index f0ae350a5e..13b51f94c8 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -117,6 +117,7 @@ signs: - --rekor-url - https://rekor.sigstore.dev/ - "--bundle=${artifact}.bundle" + - "--output-signature=${signature}" - "${artifact}" artifacts: all @@ -302,6 +303,8 @@ brews: checksum: name_template: 'checksums.txt' release: + extra_files: + - glob: '**/*.bundle' header: |- Cerbos {{ .Version }} --------------------- From 0dfd43215155397b1be1b07f866af6642a249baf Mon Sep 17 00:00:00 2001 From: Charith Ellawala Date: Tue, 9 Apr 2024 08:35:02 +0100 Subject: [PATCH 3/3] chore(release): Prepare release 0.35.1 Signed-off-by: Charith Ellawala --- deploy/charts/cerbos/Chart.yaml | 4 ++-- docs/antora-playbook.yml | 2 +- docs/antora.yml | 3 +-- netlify.toml | 12 ++++++++++++ npm/packages/cerbos-darwin-arm64/package.json | 2 +- npm/packages/cerbos-darwin-x64/package.json | 2 +- npm/packages/cerbos-linux-arm64/package.json | 2 +- npm/packages/cerbos-linux-x64/package.json | 2 +- npm/packages/cerbos/package.json | 10 +++++----- npm/packages/cerbosctl-darwin-arm64/package.json | 2 +- npm/packages/cerbosctl-darwin-x64/package.json | 2 +- npm/packages/cerbosctl-linux-arm64/package.json | 2 +- npm/packages/cerbosctl-linux-x64/package.json | 2 +- npm/packages/cerbosctl/package.json | 10 +++++----- 14 files changed, 34 insertions(+), 23 deletions(-) diff --git a/deploy/charts/cerbos/Chart.yaml b/deploy/charts/cerbos/Chart.yaml index 33ab3e7195..d58e505443 100644 --- a/deploy/charts/cerbos/Chart.yaml +++ b/deploy/charts/cerbos/Chart.yaml @@ -16,6 +16,6 @@ keywords: - policies - rbac - security -version: "0.36.0" -appVersion: "0.36.0" +version: "0.35.1" +appVersion: "0.35.1" kubeVersion: ">=1.23.0-0" diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml index ede7c92a3f..28f533dccf 100644 --- a/docs/antora-playbook.yml +++ b/docs/antora-playbook.yml @@ -21,7 +21,7 @@ urls: asciidoc: attributes: app-name: "cerbos" - app-version: "0.36.0@" + app-version: "0.35.1@" experimental: true page-pagination: true extensions: diff --git a/docs/antora.yml b/docs/antora.yml index 69de1f7441..e2a283259e 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,8 +1,7 @@ --- name: cerbos title: Cerbos -version: "0.36.0" -prerelease: -prerelease +version: "0.35.1" nav: - modules/ROOT/nav.adoc - modules/api/nav.adoc diff --git a/netlify.toml b/netlify.toml index be75fd2fbe..eba377600e 100644 --- a/netlify.toml +++ b/netlify.toml @@ -78,6 +78,18 @@ from = "/cerbos/0.35.0/:module/_images/*" to = "/cerbos/prerelease/:module/_images/:splat" status = 302 force = true + +[[redirects]] +from = "/cerbos/0.35.1/_images/*" +to = "/cerbos/prerelease/_images/:splat" +status = 302 +force = true + +[[redirects]] +from = "/cerbos/0.35.1/:module/_images/*" +to = "/cerbos/prerelease/:module/_images/:splat" +status = 302 +force = true # IMG_REDIRECTS_END # This has to be at the bottom for the above redirects to work diff --git a/npm/packages/cerbos-darwin-arm64/package.json b/npm/packages/cerbos-darwin-arm64/package.json index 7adb1bb74f..4789df0901 100644 --- a/npm/packages/cerbos-darwin-arm64/package.json +++ b/npm/packages/cerbos-darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbos-darwin-arm64", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The darwin-arm64 binary for cerbos", "repository": { "type": "git", diff --git a/npm/packages/cerbos-darwin-x64/package.json b/npm/packages/cerbos-darwin-x64/package.json index 2407ea0312..60eeb790fa 100644 --- a/npm/packages/cerbos-darwin-x64/package.json +++ b/npm/packages/cerbos-darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbos-darwin-x64", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The darwin-x64 binary for cerbos", "repository": { "type": "git", diff --git a/npm/packages/cerbos-linux-arm64/package.json b/npm/packages/cerbos-linux-arm64/package.json index 33c53c6862..b07e945c9e 100644 --- a/npm/packages/cerbos-linux-arm64/package.json +++ b/npm/packages/cerbos-linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbos-linux-arm64", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The linux-arm64 binary for cerbos", "repository": { "type": "git", diff --git a/npm/packages/cerbos-linux-x64/package.json b/npm/packages/cerbos-linux-x64/package.json index a30c23948e..ce6ea80f8b 100644 --- a/npm/packages/cerbos-linux-x64/package.json +++ b/npm/packages/cerbos-linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbos-linux-x64", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The linux-x64 binary for cerbos", "repository": { "type": "git", diff --git a/npm/packages/cerbos/package.json b/npm/packages/cerbos/package.json index 6b2b094497..7850950703 100644 --- a/npm/packages/cerbos/package.json +++ b/npm/packages/cerbos/package.json @@ -1,6 +1,6 @@ { "name": "cerbos", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The cerbos binary", "repository": { "type": "git", @@ -36,9 +36,9 @@ ], "scripts": {}, "optionalDependencies": { - "@cerbos/cerbos-darwin-arm64": "0.36.0-prerelease", - "@cerbos/cerbos-darwin-x64": "0.36.0-prerelease", - "@cerbos/cerbos-linux-arm64": "0.36.0-prerelease", - "@cerbos/cerbos-linux-x64": "0.36.0-prerelease" + "@cerbos/cerbos-darwin-arm64": "0.35.1", + "@cerbos/cerbos-darwin-x64": "0.35.1", + "@cerbos/cerbos-linux-arm64": "0.35.1", + "@cerbos/cerbos-linux-x64": "0.35.1" } } diff --git a/npm/packages/cerbosctl-darwin-arm64/package.json b/npm/packages/cerbosctl-darwin-arm64/package.json index 8ac1d3e73d..a5a0b0fd00 100644 --- a/npm/packages/cerbosctl-darwin-arm64/package.json +++ b/npm/packages/cerbosctl-darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbosctl-darwin-arm64", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The darwin-arm64 binary for cerbosctl", "repository": { "type": "git", diff --git a/npm/packages/cerbosctl-darwin-x64/package.json b/npm/packages/cerbosctl-darwin-x64/package.json index 42f12545a5..8bdc1d054f 100644 --- a/npm/packages/cerbosctl-darwin-x64/package.json +++ b/npm/packages/cerbosctl-darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbosctl-darwin-x64", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The darwin-x64 binary for cerbosctl", "repository": { "type": "git", diff --git a/npm/packages/cerbosctl-linux-arm64/package.json b/npm/packages/cerbosctl-linux-arm64/package.json index 13f3e651dc..a439942b7e 100644 --- a/npm/packages/cerbosctl-linux-arm64/package.json +++ b/npm/packages/cerbosctl-linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbosctl-linux-arm64", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The linux-arm64 binary for cerbosctl", "repository": { "type": "git", diff --git a/npm/packages/cerbosctl-linux-x64/package.json b/npm/packages/cerbosctl-linux-x64/package.json index ec72e46be9..82ca029af4 100644 --- a/npm/packages/cerbosctl-linux-x64/package.json +++ b/npm/packages/cerbosctl-linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@cerbos/cerbosctl-linux-x64", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The linux-x64 binary for cerbosctl", "repository": { "type": "git", diff --git a/npm/packages/cerbosctl/package.json b/npm/packages/cerbosctl/package.json index b9a6ddcb24..7c337f30dd 100644 --- a/npm/packages/cerbosctl/package.json +++ b/npm/packages/cerbosctl/package.json @@ -1,6 +1,6 @@ { "name": "cerbosctl", - "version": "0.36.0-prerelease", + "version": "0.35.1", "description": "The cerbosctl binary", "repository": { "type": "git", @@ -36,9 +36,9 @@ ], "scripts": {}, "optionalDependencies": { - "@cerbos/cerbosctl-darwin-arm64": "0.36.0-prerelease", - "@cerbos/cerbosctl-darwin-x64": "0.36.0-prerelease", - "@cerbos/cerbosctl-linux-arm64": "0.36.0-prerelease", - "@cerbos/cerbosctl-linux-x64": "0.36.0-prerelease" + "@cerbos/cerbosctl-darwin-arm64": "0.35.1", + "@cerbos/cerbosctl-darwin-x64": "0.35.1", + "@cerbos/cerbosctl-linux-arm64": "0.35.1", + "@cerbos/cerbosctl-linux-x64": "0.35.1" } }