Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
niiku authored Oct 13, 2023
2 parents d1e7eec + 75392ae commit e5bcf7f
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 76 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/apply-org-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected]
with:
persist-credentials: false
uses: actions/checkout@v3

- name: Peribolos run
env:
GITHUB_TOKEN: ${{ secrets.PERIBOLOS_TOKEN }}
PERIBOLOS_VERSION: v20200826-f9138eb980
GITHUB_TOKEN: ${{ secrets.PERIBOLOS_PERSONAL_TOKEN }}
run: |
echo $GITHUB_TOKEN > $RUNNER_TEMP/token
docker run --rm \
-v $RUNNER_TEMP/token:/etc/github/token \
-v $(pwd)/config.yaml:/etc/config/config.yaml \
gcr.io/k8s-prow/peribolos:$PERIBOLOS_VERSION \
gcr.io/k8s-prow/peribolos:v20230418-23b5d25059 \
--github-token-path /etc/github/token \
--config-path /etc/config/config.yaml \
--fix-org \
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/verify-branch-author-email.yaml

This file was deleted.

13 changes: 3 additions & 10 deletions .github/workflows/verify-org-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,21 @@ jobs:
verify-org-config:
runs-on: ubuntu-latest
steps:
- name: Checkout master
uses: actions/[email protected]
with:
persist-credentials: false

- name: Checkout PR branch
uses: actions/checkout@v2.3.1
uses: actions/checkout@v3
with:
persist-credentials: false
ref: ${{ github.event.pull_request.head.sha }}
path: pr

- name: Peribolos dry-run
env:
GITHUB_TOKEN: ${{ secrets.PERIBOLOS_TOKEN }}
PERIBOLOS_VERSION: v20200826-f9138eb980
GITHUB_TOKEN: ${{ secrets.PERIBOLOS_PERSONAL_TOKEN }}
run: |
echo $GITHUB_TOKEN > $RUNNER_TEMP/token
docker run --rm \
-v $RUNNER_TEMP/token:/etc/github/token \
-v $(pwd)/pr/config.yaml:/etc/config/config.yaml \
gcr.io/k8s-prow/peribolos:$PERIBOLOS_VERSION \
gcr.io/k8s-prow/peribolos:v20230418-23b5d25059 \
--github-token-path /etc/github/token \
--config-path /etc/config/config.yaml \
--fix-org \
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
106 changes: 81 additions & 25 deletions config.yaml
Original file line number Diff line number Diff line change
@@ -1,59 +1,89 @@
orgs:
baloise-incubator:
name: Baloise Group - Incubator
billing_email: [email protected]
company: ""
default_repository_permission: write
description: Evaluation and incubation of new technologies for the Baloise Group
email: [email protected]
has_organization_projects: true
has_repository_projects: true
location: Aeschengraben 21, 4002 Basel, Switzerland
members_can_create_repositories: true
admins:
- baopso
- culmat
- hirsch88
- incubator-tekton
- joachimprinzbach
- MarkusTiede
- niiku
- patrit
billing_email: [email protected]
company: ""
default_repository_permission: read
description: Evaluation and incubation of new technologies for the Baloise Group
email: [email protected]
has_organization_projects: true
has_repository_projects: true
location: Aeschengraben 21, 4002 Basel, Switzerland
- arburk
- koenigle
- kullmanp
- Tiliavir
- svene
- robert-groensfeld
- danielgrob
- d038496
members:
- ArivinK
- jembas
- Alex-Thoma
- arburk
- baloise-incubator-bot
- alexsoeres
- chris-lipp
- christiansiegel
- christophgeering
- clastzoo
- clemensgbasler
- CookieMonster70
- daniel-st
- danielgrob
- dianaracho
- Dr-Tech81
- fabio-tedesco
- felixkrohn
- frank-baier
- Gagne87
- gerohoff
- geschba
- geschbach
- Ginious
- GinaBiondo-aperto
- hannah-mat
- janineKleessen
- jacnguymesoneer
- JohnnyGoodNews
- jordilaforge
- kullmanp
- JasperDeLanghe
- l0r5
- leubedane
- luechtdiode
- MarkusFlorian79
- max-voss
- mbobzin
- mladenplaninicic
- miksaylo87
- niels-oz
- nobilo
- NoraKurzbein
- rainerblumenthal
- sbubendorf
- schlijo
- soenkeSchmidt
- serialcool
- StephanSST
- svene
- stefanbukovski
- m4rc0z
- tbe1
- tirun
- tklueber
- trichie
- ThomasSeyssensTPO
- vangual
- yannickholzenkamp
- mikevader
- mkasparsone
- ArthurNeudeck
- mateuszbaloise
- skytime-sh
Expand All @@ -63,6 +93,7 @@ orgs:
- RotscherK
- sobabufe
- Mission71
- MelPiw
- lagoaresti
- sebastianzillessen
- stefanschoe
Expand All @@ -71,17 +102,43 @@ orgs:
- AlainLatscha
- renat1sakenov
- gitops-demo-user
- MarcoUebner
- kamrwo
- mabegglen
- mebagel
- madaluca
- sebaotlacan
- Sw0rdiX
- th-basler
- MartinV-DevOps
- pkreisel
- dombosfi
- mikeleber
- gueltekinB
- dweber019
- harry08
- l-brendle
- janhkrueger
- RiLi2001
- rainerblumenthaö
- volkerbasler
- viclientali
- frevers81
- monkold
- henriks23
- czimmernn1
- nataliia-karpenko
- tommuelli
- makrelas
- ingenuity2k
- nteofilovic
- koljaju
- FilipMarkovski
- hejransa
- lazaki
- predrag-arsic
- Schneidarr
- trikke
- daniel-battaglia
- m1markus
members_can_create_repositories: true
name: Baloise Group - Incubator
teams:
Organization Managers:
description: Baloise Incubator GitHub Organization Managers
Expand All @@ -90,17 +147,16 @@ orgs:
members:
- culmat
- hirsch88
- incubator-tekton
- joachimprinzbach
- MarkusTiede
- niiku
- patrit
- arburk
- kullmanp
- Tiliavir
- svene
- danielgrob
- d038496
privacy: closed
repos:
org: admin
Alumni:
description: Former member of the Baloise Incubator Open Source Group
maintainers:
- baopso
members:
- christiansiegel
privacy: closed

0 comments on commit e5bcf7f

Please sign in to comment.