Skip to content

Commit 9be3a4e

Browse files
authored
Merge commit from fork
1 parent 2179f5f commit 9be3a4e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/check-generated-files.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# TODO(rm3l): list of authorized users that do not require manual review comes from the maintainers team and various robot accounts that handle automation in the repo => find a better way not to hardcode this list!
1818
environment:
1919
${{ (github.event.pull_request.head.repo.full_name == github.repository ||
20-
contains(fromJSON('["odo-robot[bot]", "dependabot[bot]", "openshift-ci[bot]", "openshift-merge-robot", "openshift-ci-robot", "kadel", "rm3l"]'), github.actor)) &&
20+
contains(fromJSON('["odo-robot[bot]", "dependabot[bot]", "openshift-ci[bot]", "openshift-merge-robot", "openshift-ci-robot", "kadel", "rm3l"]'), github.event.pull_request.user.login)) &&
2121
'internal' || 'external' }}
2222
runs-on: ubuntu-latest
2323
steps:
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/checkout@v4
3535
with:
3636
repository: ${{github.event.pull_request.head.repo.full_name}}
37-
ref: ${{ github.event.pull_request.head.ref }}
37+
ref: ${{ github.event.pull_request.head.sha }}
3838

3939
- name: Generate static files for UI
4040
run: make ui-static

.github/workflows/ci-remote-clusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
# TODO(rm3l): list of authorized users that do not require manual review comes from the maintainers team and various robot accounts that handle automation in the repo => find a better way not to hardcode this list!
2828
environment:
2929
${{ (github.event.pull_request.head.repo.full_name == github.repository ||
30-
contains(fromJSON('["odo-robot[bot]", "openshift-ci[bot]", "openshift-merge-robot", "openshift-ci-robot", "kadel", "rm3l"]'), github.actor)) &&
30+
contains(fromJSON('["odo-robot[bot]", "openshift-ci[bot]", "openshift-merge-robot", "openshift-ci-robot", "kadel", "rm3l"]'), github.event.pull_request.user.login)) &&
3131
'internal' || 'external' }}
3232
runs-on: ubuntu-latest
3333
steps:

.github/workflows/pr-website.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# TODO(rm3l): list of authorized users that do not require manual review comes from the maintainers team and various robot accounts that handle automation in the repo => find a better way not to hardcode this list!
3535
environment:
3636
${{ (github.event.pull_request.head.repo.full_name == github.repository ||
37-
contains(fromJSON('["odo-robot[bot]", "dependabot[bot]", "openshift-ci[bot]", "openshift-merge-robot", "openshift-ci-robot", "kadel", "rm3l"]'), github.actor)) &&
37+
contains(fromJSON('["odo-robot[bot]", "dependabot[bot]", "openshift-ci[bot]", "openshift-merge-robot", "openshift-ci-robot", "kadel", "rm3l"]'), github.event.pull_request.user.login)) &&
3838
'internal' || 'external' }}
3939
runs-on: ubuntu-latest
4040
steps:

0 commit comments

Comments
 (0)