Skip to content

Commit f8d5367

Browse files
authored
fic permission issue (#1141)
1 parent 83b9518 commit f8d5367

File tree

2 files changed

+7
-27
lines changed

2 files changed

+7
-27
lines changed

.github/workflows/Nightly_Perf_Env_CI.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -399,14 +399,9 @@ jobs:
399399
run: |
400400
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
401401
git config --global user.name "github-actions[bot]"
402-
git config pull.rebase false # merge
403-
cd "$GITHUB_WORKSPACE"
404-
git stash push --include-untracked -m "temp stash"
405-
git add "benchmark_runner/grafana/perf/dashboard.json
406-
git commit -m "Update grafana json file [skip ci]"
407-
git pull origin HEAD --no-rebase
402+
git add "$GITHUB_WORKSPACE"/benchmark_runner/grafana/perf/dashboard.json
403+
git commit -am "Update grafana json file [skip ci]"
408404
git push origin HEAD
409-
git stash pop || true
410405
411406
- name: Check if adding new products versions in main.libsonnet
412407
id: libsonnet_check_changes
@@ -420,11 +415,6 @@ jobs:
420415
run: |
421416
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
422417
git config --global user.name "github-actions[bot]"
423-
git config pull.rebase false
424-
cd "$GITHUB_WORKSPACE"
425-
git stash push --include-untracked -m "temp stash"
426-
git add benchmark_runner/grafana/perf/jsonnet/main.libsonnet
427-
git commit -m "Update grafana json file [skip ci]" || true
428-
git pull origin HEAD --no-rebase
418+
git add "$GITHUB_WORKSPACE"/benchmark_runner/grafana/perf/jsonnet/main.libsonnet
419+
git commit -am "Update grafana json file [skip ci]"
429420
git push origin HEAD
430-
git stash pop || true

.github/workflows/Perf_Env_Build_Test_CI.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -467,14 +467,9 @@ jobs:
467467
run: |
468468
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
469469
git config --global user.name "github-actions[bot]"
470-
git config pull.rebase false # merge
471-
cd "$GITHUB_WORKSPACE"
472-
git stash push --include-untracked -m "temp stash"
473-
git add "benchmark_runner/grafana/perf/dashboard.json
470+
git add "$GITHUB_WORKSPACE"/benchmark_runner/grafana/perf/dashboard.json
474471
git commit -m "Update grafana json file [skip ci]"
475-
git pull origin HEAD --no-rebase
476472
git push origin HEAD
477-
git stash pop || true
478473
479474
- name: Check if adding new products versions in main.libsonnet
480475
id: libsonnet_check_changes
@@ -488,11 +483,6 @@ jobs:
488483
run: |
489484
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
490485
git config --global user.name "github-actions[bot]"
491-
git config pull.rebase false
492-
cd "$GITHUB_WORKSPACE"
493-
git stash push --include-untracked -m "temp stash"
494-
git add benchmark_runner/grafana/perf/jsonnet/main.libsonnet
495-
git commit -m "Update grafana json file [skip ci]" || true
496-
git pull origin HEAD --no-rebase
486+
git add "$GITHUB_WORKSPACE"/benchmark_runner/grafana/perf/jsonnet/main.libsonnet
487+
git commit -am "Update grafana json file [skip ci]"
497488
git push origin HEAD
498-
git stash pop || true

0 commit comments

Comments
 (0)