Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
blackchoey authored Sep 11, 2024
2 parents 9213d64 + 06ee822 commit e6b30ef
Show file tree
Hide file tree
Showing 1,818 changed files with 729,023 additions and 299,679 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

/src/internet-analyzer/ @jsntcy

/src/spring-cloud/ @peizhou298
/src/spring-cloud/ @yuwzho

/src/peering/ @jsntcy

Expand Down
7 changes: 7 additions & 0 deletions .github/template/non-security-comment.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Hi, this inquiry has been well received albeit being triaged as non-security related ask.

Azure CLI is currently prioritizing direct SFI requirements and items and this request does not seem to be related to SFI. We'll retain it in our backlog at this point. Please reach out to AzPyCli@microsoft.com if you'd justify it's highly customer-impacted and need to be escalated.

Thank you,

Azure CLI team
25 changes: 25 additions & 0 deletions .github/workflows/AddIssueCommentWithLabel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Comment Issue when labeled non-security
on:
issues:
types: [opened, labeled, unlabeled]

jobs:
comment-non-security:
if: contains(github.event.issue.labels.*.name, 'non-security')
runs-on: ubuntu-20.04
permissions:
issues: write
name: Comment on issue
steps:
- name: Checkout comment message
uses: actions/checkout@v4
with:
sparse-checkout: |
.github/template/non-security-comment.md
- name: Comment on issue with no security label
uses: mshick/add-pr-comment@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
message-id: issueNoSecurityCommentBot
message-path: |
.github/template/non-security-comment.md
2 changes: 1 addition & 1 deletion .github/workflows/BlockPRMerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
script: |
const labels = context.payload.pull_request.labels.map(label => label.name);
const blockedLabels = ["do-not-merge", "needs-author-feedback", "release-version-block"];
const blockedLabels = ["do-not-merge", "needs-author-feedback"];
if (labels.some(label => blockedLabels.includes(label))) {
console.log(`It is not allowed to merge a PR with any blocked labels: ${blockedLabels}`);
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/ProcessCodeReview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,27 @@ jobs:
env:
bash_sha: ${{ github.event.pull_request.base.sha }}
base_branch: ${{ github.event.pull_request.base.ref }}
base_repo: ${{ github.event.pull_request.base.repo.clone_url }}
base_branch_pre: "upstream"
diff_sha: ${{ github.event.pull_request.head.sha }}
diff_branch: ${{ github.event.pull_request.head.ref }}
repo_full_name: ${{ github.event.pull_request.head.repo.full_name }}
run: |
set -x
git --version
git log --oneline | head -n 30
git log --oneline | head -n 10
git branch -a
git fetch https://github.com/Azure/azure-cli-extensions.git "$base_branch":"$base_branch_pre"/"$base_branch"
git fetch "$base_repo" "$base_branch":"$base_branch_pre"/"$base_branch"
git checkout "$base_branch_pre"/"$base_branch"
git log --oneline | head -n 30
git log --oneline | head -n 10
git checkout "$diff_branch"
git log --oneline | head -n 30
git log --oneline | head -n 10
git --no-pager diff --name-only --diff-filter=ACMRT "$base_branch_pre"/"$base_branch"..."$diff_branch" > changed_files
cat changed_files
echo "changed_module_list=$(cat changed_files | grep azext_ | awk -F"azext_" '{print $1}'| awk -F"/" '{print $2}' | sort | uniq | xargs)" >> $GITHUB_ENV
echo "changed_module_list=$(cat changed_files | grep src/ | awk -F"src/" '{print $2}'| grep / | awk -F"/" '{print $1}' | sort | uniq | xargs)" >> $GITHUB_ENV
- name: Display Diff Modules
run: |
for mod in "$changed_module_list"
for mod in ${changed_module_list[@]}
do
echo changed module: "${mod}"
done
Expand Down
Loading

0 comments on commit e6b30ef

Please sign in to comment.