Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update(config/config.yaml): switch default branch to main for plugins repo #1432

Merged
merged 4 commits into from
Mar 28, 2024
Merged

update(config/config.yaml): switch default branch to main for plugins repo #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a8d877
update(config/config.yaml): switch default branch to `main` for `plug…
leogr Mar 28, 2024
8311903
update(images/build-plugins): switch default branch to `main` for `pl…
leogr Mar 28, 2024
1d79241
update(config/clusters): switch branch to `main` for `plugins` repo
leogr Mar 28, 2024
85a6830
update(build-plugins): switch branch to `main` for `plugins` repo
leogr Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/clusters/iam.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ module "plugins_s3_role" {
name = "github_actions-plugins-s3"
create = true
subjects = [
"falcosecurity/plugins:ref:refs/heads/master",
"falcosecurity/plugins:ref:refs/heads/main",
"falcosecurity/plugins:ref:refs/tags/*"
]
policies = {
Expand Down
2 changes: 1 addition & 1 deletion config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ branch-protection:
- "build-and-test"
plugins:
branches:
master:
main:
protect: true
plugin-sdk-go:
required_status_checks:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/build-plugins/build-plugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ postsubmits:
skip_report: false
agent: kubernetes
branches:
- ^master$
- ^main$
run_if_changed: "^registry.yaml"
spec:
containers:
Expand Down
5 changes: 3 additions & 2 deletions images/build-plugins/on-registry-changed.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
GH_PROXY="${GH_PROXY:-"http://ghproxy"}"
GH_ORG="${GH_ORG:-"falcosecurity"}"
GH_REPO="${GH_REPO:-"plugins"}"
GH_REPO_BRANCH="${GH_REPO_BRANCH:-"main"}"
GH_INDEX_REPO="${GH_INDEX_REPO:-"falcoctl"}"
GH_INDEX_REPO_BRANCH="${GH_INDEX_REPO_BRANCH:-"gh-pages"}"
BOT_NAME="${BOT_NAME:-"poiana"}"
Expand Down Expand Up @@ -79,13 +80,13 @@ create_pr() {
"https://${user}:$(cat "$1")@github.com/${GH_ORG}/${GH_REPO}" \
"HEAD:${branch}"

echo "> creating pull-request to merge ${user}:${branch} into master..." >&2
echo "> creating pull-request to merge ${user}:${branch} into ${GH_REPO_BRANCH}..." >&2
body=$'Updating README.md (automatically generated with build/registry). Made using the [build-plugins-on-registry-changed-postsubmit](https://github.com/falcosecurity/test-infra/blob/master/config/jobs/build-plugins/build-plugins.yaml) ProwJob. Do not edit this PR.\n\n/kind documentation\n\n/area documentation'

pr-creator \
--github-endpoint="${GH_PROXY}" \
--github-token-path="$1" \
--org="${GH_ORG}" --repo="${GH_REPO}" --branch=master \
--org="${GH_ORG}" --repo="${GH_REPO}" --branch="${GH_REPO_BRANCH}" \
--title="${title}" --match-title="${title}" \
--body="${body}" \
--local --source="${branch}" \
Expand Down
Loading