Skip to content

Commit

Permalink
Feature: Add iotedge-lorawan-starterkit as git submodule (#2347)
Browse files Browse the repository at this point in the history
* Add iotedge-lorawan-starterkit git submodule

* Update portal_with_lorawan_and_starter_kit.bicep to target lorawan-starterkit git submodule files

* Update validate_arm_templates ci job

* Update arm-ttk to test only azuredeploy.json

* Remove lorawan-starter-kit git module

* Add lorawan-starter-kit git submodule in the correct folder

* Fix iotedge-lorawan-starterkit main.bicep path in portal_with_lorawan_and_starter_kit.bicep

* Revert arm-ttk job

* Update arm_templates ci job to handle lorawan-starterkit git submodule

* Add branch on lorawan starter kit git sub module
  • Loading branch information
hocinehacherouf authored Aug 7, 2023
1 parent 8f0be5c commit e46041c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 21 deletions.
18 changes: 7 additions & 11 deletions .github/workflows/arm-ttk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,21 @@ jobs:
repo: context.repo.repo,
labels: ['arm-templates']
})
- uses: actions/[email protected]
with:
submodules: recursive

- name: Generate ARM file
working-directory: templates/azure
run: az bicep build --file azuredeploy.bicep --outfile azuredeploy.json

- name: Checkout Azure/arm-ttk
uses: actions/[email protected]
with:
repository: Azure/arm-ttk
path: arm-ttk

- name: Checkout Azure/iotedge-lorawan-starterkit
uses: actions/[email protected]
with:
repository: Azure/iotedge-lorawan-starterkit
ref: dev
path: templates/iotedge-lorawan-starterkit

- name: Generate ARM file
working-directory: templates/azure
run: az bicep build --file azuredeploy.bicep --outfile azuredeploy.json

- name: Run arm-ttk
shell: pwsh
run: |
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,7 @@ jobs:
- uses: actions/[email protected]
with:
path: IoT-Hub-Portal

- name: Checkout Azure/iotedge-lorawan-starterkit
uses: actions/[email protected]
with:
repository: Azure/iotedge-lorawan-starterkit
ref: dev
path: iotedge-lorawan-starterkit
submodules: recursive

- uses: actions/[email protected]
with:
Expand All @@ -131,7 +125,8 @@ jobs:
mkdir -p templates/azure/iotedge-lorawan-starterkit
touch ./templates/.gitkeep
cp -r ../IoT-Hub-Portal/templates/* ./templates/
cp -r ../iotedge-lorawan-starterkit/TemplateBicep/* ./templates/azure/iotedge-lorawan-starterkit/
rm -rf ./templates/iotedge-lorawan-starterkit/
cp -r ../IoT-Hub-Portal/templates/iotedge-lorawan-starterkit/TemplateBicep/* ./templates/azure/iotedge-lorawan-starterkit/
sed -r -i 's/..\/iotedge-lorawan-starterkit\/TemplateBicep\/main.bicep/.\/iotedge-lorawan-starterkit\/main.bicep/g' ./templates/azure/portal_with_lorawan_and_starter_kit.bicep
- name: Update IoTHub Portal docker image tag in app_service.bicep
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,4 @@ Temporary Items
# End of https://www.toptal.com/developers/gitignore/api/macos
src/IoTHub.Portal/Client/assets/package-lock.json

# Folder for iotedge-lorawan-starterkit bicep templates
iotedge-lorawan-starterkit/
**/appsettings.Development.json
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "templates/iotedge-lorawan-starterkit"]
path = templates/iotedge-lorawan-starterkit
url = https://github.com/Azure/iotedge-lorawan-starterkit.git
branch = dev
1 change: 1 addition & 0 deletions templates/iotedge-lorawan-starterkit

0 comments on commit e46041c

Please sign in to comment.