Skip to content

Commit e903865

Browse files
committed
Merge branch 'master' of github.com:Azure/azure-resource-manager-schemas into update-autorest
2 parents cc02849 + 12d2b44 commit e903865

File tree

71 files changed

+33277
-1175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+33277
-1175
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,7 @@ jobs:
5858
echo $check_result;
5959
done <<< "$exec";
6060
61-
echo "AUTOGENLIST_CHECK_RESULT=$check_result" >> $GITHUB_ENV;
61+
if [ $check_result == 'false' ] ; then
62+
exit 1
63+
fi
6264
working-directory: ./generator
63-
64-
- uses: hmarr/auto-approve-action@v2.0.0
65-
if: ${{ env.AUTOGENLIST_CHECK_RESULT == 'true' }}
66-
with:
67-
github-token: "${{ secrets.GITHUB_TOKEN }}"
68-
69-
- name: Automerge
70-
if: ${{ env.AUTOGENLIST_CHECK_RESULT == 'true' }}
71-
uses: "pascalgn/automerge-action@v0.12.0"
72-
env:
73-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
74-
MERGE_LABELS: ""
75-
UPDATE_LABELS: ""

generator/autogenlist.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,20 @@ const autogenlist: AutogenlistConfig[] = [
454454
basePath: 'relay/resource-manager',
455455
namespace: 'Microsoft.Relay',
456456
},
457+
{
458+
basePath: 'recoveryservicessiterecovery/resource-manager',
459+
namespace: 'Microsoft.RecoveryServices',
460+
suffix: 'SiteRecovery',
461+
},
462+
{
463+
basePath: 'recoveryservicesbackup/resource-manager',
464+
namespace: 'Microsoft.RecoveryServices',
465+
suffix: "Backup"
466+
},
467+
{
468+
basePath: "recoveryservices/resource-manager",
469+
namespace: "Microsoft.RecoveryServices"
470+
},
457471
{
458472
basePath: 'reservations/resource-manager',
459473
namespace: 'Microsoft.Capacity',

0 commit comments

Comments
 (0)