Skip to content

Commit 4d47672

Browse files
authored
Merge pull request #188 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 96872fb + 3c18f8b commit 4d47672

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
2+
# More GitHub Actions for Azure: https://github.com/Azure/actions
3+
4+
name: Build and deploy Powershell project to Azure Function App - cippyumsh-proc
5+
6+
on:
7+
push:
8+
branches:
9+
- dev
10+
workflow_dispatch:
11+
12+
env:
13+
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
14+
15+
jobs:
16+
deploy:
17+
runs-on: windows-latest
18+
19+
steps:
20+
- name: 'Checkout GitHub Action'
21+
uses: actions/checkout@v4
22+
23+
- name: 'Run Azure Functions Action'
24+
uses: Azure/functions-action@v1
25+
id: fa
26+
with:
27+
app-name: 'cippyumsh-proc'
28+
slot-name: 'Production'
29+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_8AA04F8C6F644F639CD74D3816E1BF08 }}

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ function Invoke-CIPPStandardIntuneTemplate {
8686
remediate = $Template.remediate
8787
existingPolicyId = $ExistingPolicy.id
8888
templateId = $Template.TemplateList.value
89+
customGroup = $Template.customGroup
8990
}
9091
} else {
9192
Write-Host "IntuneTemplate: $($Template.TemplateList.value) - No differences found."
@@ -101,6 +102,7 @@ function Invoke-CIPPStandardIntuneTemplate {
101102
remediate = $Template.remediate
102103
existingPolicyId = $ExistingPolicy.id
103104
templateId = $Template.TemplateList.value
105+
customGroup = $Template.customGroup
104106
}
105107
}
106108
}

0 commit comments

Comments
 (0)