File tree Expand file tree Collapse file tree 3 files changed +51
-5
lines changed Expand file tree Collapse file tree 3 files changed +51
-5
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,27 @@ concurrency:
77 group : building-blocks-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
88 cancel-in-progress : true
99
10+ <<<<<<< Updated upstream
1011jobs :
1112 pr-status-check :
1213 uses : " openmcp-project/blueprint-workflows/.github/workflows/git-pr-status-checks.yml@main"
13- secrets : inherit
14+ secrets : inherit
15+ =======
16+ permissions :
17+ pull-requests : write
18+ contents : write
19+ packages : read
20+ actions : write
21+ checks : write
22+ statuses : write
23+
24+ jobs :
25+ pr-status-check :
26+ uses : " openmcp-project/blueprint-workflows/.github/workflows/git-pr-status-checks.yml@chore/os_preparations"
27+ with :
28+ HELM_OCI_REGISTRY : ' ghcr.io'
29+ BUILDING_BLOCKS_GIT_REPO_URL : ' https://github.com/openmcp-project/blueprint-building-blocks.git'
30+ secrets :
31+ HELM_REPO_USERNAME : " ${{ secrets.GITHUB_TOKEN }}"
32+ HELM_REPO_TOKEN : " ${{ secrets.GITHUB_TOKEN }}"
33+ >>>>>>> Stashed changes
Original file line number Diff line number Diff line change @@ -9,8 +9,21 @@ concurrency:
99 group : ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1010 cancel-in-progress : true
1111
12+ permissions :
13+ pull-requests : write
14+ contents : write
15+ packages : read
16+ actions : write
17+ checks : write
18+ statuses : write
19+
1220jobs :
1321 pr-status-check :
1422 if : ${{ github.event.pull_request.head.repo.full_name != 'openmcp-project/blueprint-building-blocks' }}
15- uses : " openmcp-project/blueprint-building-blocks/.github/workflows/git-pr-status-checks.yml@main"
16- secrets : inherit
23+ uses : " openmcp-project/blueprint-workflows/.github/workflows/git-pr-status-checks.yml@chore/os_preparations"
24+ with :
25+ HELM_OCI_REGISTRY : ' ghcr.io'
26+ BUILDING_BLOCKS_GIT_REPO_URL : ' https://github.com/openmcp-project/blueprint-building-blocks.git'
27+ secrets :
28+ HELM_REPO_USERNAME : " ${{ secrets.GITHUB_TOKEN }}"
29+ HELM_REPO_TOKEN : " ${{ secrets.GITHUB_TOKEN }}"
Original file line number Diff line number Diff line change @@ -9,8 +9,21 @@ concurrency:
99 group : ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1010 cancel-in-progress : true
1111
12+ permissions :
13+ pull-requests : write
14+ contents : write
15+ packages : read
16+ actions : write
17+ checks : write
18+ statuses : write
19+
1220jobs :
1321 pr-status-check :
1422 if : ${{ github.event.pull_request.head.repo.full_name == 'openmcp-project/blueprint-building-blocks' }}
15- uses : " openmcp-project/blueprint-building-blocks/.github/workflows/git-pr-status-checks.yml@main"
16- secrets : inherit
23+ uses : " openmcp-project/blueprint-workflows/.github/workflows/git-pr-status-checks.yml@chore/os_preparations"
24+ with :
25+ HELM_OCI_REGISTRY : ' ghcr.io'
26+ BUILDING_BLOCKS_GIT_REPO_URL : ' https://github.com/openmcp-project/blueprint-building-blocks.git'
27+ secrets :
28+ HELM_REPO_USERNAME : " ${{ secrets.GITHUB_TOKEN }}"
29+ HELM_REPO_TOKEN : " ${{ secrets.GITHUB_TOKEN }}"
You can’t perform that action at this time.
0 commit comments