Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Add iotedge-lorawan-starterkit as git submodule #2347

Merged
merged 10 commits into from
Aug 7, 2023
Merged

Feature: Add iotedge-lorawan-starterkit as git submodule #2347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
29d34c0
Add iotedge-lorawan-starterkit git submodule
hocinehacherouf Jul 21, 2023
9e8ebf6
Update portal_with_lorawan_and_starter_kit.bicep to target lorawan-st…
hocinehacherouf Jul 21, 2023
07a3414
Update validate_arm_templates ci job
hocinehacherouf Jul 21, 2023
cabe010
Update arm-ttk to test only azuredeploy.json
hocinehacherouf Jul 21, 2023
58a8aad
Remove lorawan-starter-kit git module
hocinehacherouf Jul 21, 2023
0e258a8
Add lorawan-starter-kit git submodule in the correct folder
hocinehacherouf Jul 21, 2023
6481e45
Fix iotedge-lorawan-starterkit main.bicep path in portal_with_lorawan…
hocinehacherouf Jul 21, 2023
b6aa7a4
Revert arm-ttk job
hocinehacherouf Jul 21, 2023
aa10460
Update arm_templates ci job to handle lorawan-starterkit git submodule
hocinehacherouf Jul 21, 2023
bc902bb
Add branch on lorawan starter kit git sub module
hocinehacherouf Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions .github/workflows/arm-ttk.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Open in desktop
Submodule iotedge-lorawan-starterkit added at d9848b