From 031569c98e123e1838bd4411ac99f0f52aaf9d09 Mon Sep 17 00:00:00 2001 From: AllyW Date: Tue, 8 Apr 2025 18:12:00 +0800 Subject: [PATCH 1/3] reset workflow file --- .github/workflows/AzdevLinter.yml | 5 +++++ .github/workflows/AzdevStyle.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/AzdevLinter.yml b/.github/workflows/AzdevLinter.yml index a9a5c21dd5e..1cb2c4c36ab 100644 --- a/.github/workflows/AzdevLinter.yml +++ b/.github/workflows/AzdevLinter.yml @@ -18,6 +18,10 @@ jobs: steps: - name: Checkout CLI extension repo uses: actions/checkout@v4 + with: + fetch-depth: 1 + sparse-checkout: | + .github - name: Azdev Env Setup uses: ./.github/actions/env-setup - name: Get Diff Files @@ -46,6 +50,7 @@ jobs: cat changed_files cat changed_files | grep src/ | awk -F"src/" '{print $2}'| grep / | awk -F"/" '{print $1}' | sort | uniq echo "changed_module_list=$(cat changed_files | grep src/ | awk -F"src/" '{print $2}'| grep / | awk -F"/" '{print $1}' | sort | uniq | xargs)" >> $GITHUB_ENV + git checkout "$base_branch_pre"/"$base_branch" - name: Display PR Diff Modules run: | for mod in ${changed_module_list[@]} diff --git a/.github/workflows/AzdevStyle.yml b/.github/workflows/AzdevStyle.yml index 7c8e193afdc..326b1d8666f 100644 --- a/.github/workflows/AzdevStyle.yml +++ b/.github/workflows/AzdevStyle.yml @@ -18,6 +18,10 @@ jobs: steps: - name: Checkout CLI extension repo uses: actions/checkout@v4 + with: + fetch-depth: 1 + sparse-checkout: | + .github - name: Azdev Env Setup uses: ./.github/actions/env-setup - name: Get Diff Files @@ -46,6 +50,7 @@ jobs: cat changed_files cat changed_files | grep src/ | awk -F"src/" '{print $2}'| grep / | awk -F"/" '{print $1}' | sort | uniq echo "changed_module_list=$(cat changed_files | grep src/ | awk -F"src/" '{print $2}'| grep / | awk -F"/" '{print $1}' | sort | uniq | xargs)" >> $GITHUB_ENV + git checkout "$base_branch_pre"/"$base_branch" - name: Display PR Diff Modules run: | for mod in ${changed_module_list[@]} From 7c671ec4d34f844d38f4571e995d683ac66d60c8 Mon Sep 17 00:00:00 2001 From: AllyW Date: Mon, 31 Mar 2025 15:12:32 +0800 Subject: [PATCH 2/3] test version cal --- scripts/ci/release_version_cal.py | 1 + src/communication/setup.py | 2 +- src/monitor-control-service/setup.py | 2 +- .../aaz/latest/network/manager/_update.py | 6 +++--- src/network-manager/azext_network_manager/commands.py | 2 +- src/network-manager/setup.py | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/ci/release_version_cal.py b/scripts/ci/release_version_cal.py index dd2b06f6b0c..e1154b14e27 100644 --- a/scripts/ci/release_version_cal.py +++ b/scripts/ci/release_version_cal.py @@ -17,6 +17,7 @@ VERSION_PATCH_TAG, VERSION_STABLE_TAG, VERSION_PREVIEW_TAG, VERSION_PRE_TAG) from util import get_index_data +print("testing scripts loading") base_meta_path = os.environ.get('base_meta_path', None) diff_meta_path = os.environ.get('diff_meta_path', None) result_path = os.environ.get('result_path', None) diff --git a/src/communication/setup.py b/src/communication/setup.py index 20a4e46edf5..050bd4b740a 100644 --- a/src/communication/setup.py +++ b/src/communication/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # HISTORY.rst entry. -VERSION = '1.13.0' +VERSION = '1.13.3' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers diff --git a/src/monitor-control-service/setup.py b/src/monitor-control-service/setup.py index cb6a0c5b1e9..0097938dc5f 100644 --- a/src/monitor-control-service/setup.py +++ b/src/monitor-control-service/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # HISTORY.rst entry. -VERSION = '1.2.0' +VERSION = '2.0.0' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers diff --git a/src/network-manager/azext_network_manager/aaz/latest/network/manager/_update.py b/src/network-manager/azext_network_manager/aaz/latest/network/manager/_update.py index 6999d64319d..e5e049ec172 100644 --- a/src/network-manager/azext_network_manager/aaz/latest/network/manager/_update.py +++ b/src/network-manager/azext_network_manager/aaz/latest/network/manager/_update.py @@ -11,9 +11,9 @@ from azure.cli.core.aaz import * -@register_command( - "network manager update", -) +# @register_command( +# "network manager update", +# ) class Update(AAZCommand): """Update a Network Manager. diff --git a/src/network-manager/azext_network_manager/commands.py b/src/network-manager/azext_network_manager/commands.py index 383dbbbd12d..0e6c21fbbe4 100644 --- a/src/network-manager/azext_network_manager/commands.py +++ b/src/network-manager/azext_network_manager/commands.py @@ -15,7 +15,7 @@ def load_command_table(self, _): with self.command_group('network manager') as g: g.custom_command('create', 'network_manager_create') - g.custom_command('update', 'network_manager_update') + # g.custom_command('update', 'network_manager_update') with self.command_group('network manager connect-config') as g: from .custom import ConnectConfigCreate, ConnectConfigUpdate diff --git a/src/network-manager/setup.py b/src/network-manager/setup.py index f64ff6fd7d3..b5fcb0e99b2 100644 --- a/src/network-manager/setup.py +++ b/src/network-manager/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # HISTORY.rst entry. -VERSION = '2.0.0' +VERSION = '2.1.0' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers From a2579e2b49669f22a9ea395a1cd9e03915b345b9 Mon Sep 17 00:00:00 2001 From: AllyW Date: Mon, 31 Mar 2025 15:38:35 +0800 Subject: [PATCH 3/3] test metadata --- src/monitor-control-service/azext_amcs/azext_metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/monitor-control-service/azext_amcs/azext_metadata.json b/src/monitor-control-service/azext_amcs/azext_metadata.json index 9d0fefa5401..2f095855fee 100644 --- a/src/monitor-control-service/azext_amcs/azext_metadata.json +++ b/src/monitor-control-service/azext_amcs/azext_metadata.json @@ -1,3 +1,4 @@ { - "azext.minCliCoreVersion": "2.61.0" + "azext.minCliCoreVersion": "2.61.0", + "azext.isPreview": true } \ No newline at end of file