Skip to content

Commit

Permalink
Merge branch 'Azure:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
poppywood committed Oct 19, 2022
2 parents d2c9054 + f774184 commit 05f61b5
Show file tree
Hide file tree
Showing 378 changed files with 18,152 additions and 14,777 deletions.
29 changes: 29 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,33 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.cs]
dotnet_naming_rule.private_constants_rule.severity = warning
dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style
dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
dotnet_naming_rule.private_instance_fields_rule.severity = warning
dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style
dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols
dotnet_naming_rule.private_static_fields_rule.severity = warning
dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style
dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
dotnet_naming_rule.private_static_readonly_rule.severity = warning
dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style
dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly

[*.md]
charset = utf-8

Expand Down Expand Up @@ -108,6 +135,8 @@ dotnet_diagnostic.IDE1003.severity=suggestion
dotnet_diagnostic.IDE1004.severity=suggestion
dotnet_diagnostic.IDE1007.severity=suggestion
dotnet_diagnostic.IDE1008.severity=suggestion
dotnet_diagnostic.IDE0074.severity=suggestion
dotnet_diagnostic.IDE0240.severity=suggestion

# Enforce file header
dotnet_diagnostic.IDE0073.severity = error
Expand Down
7 changes: 4 additions & 3 deletions .github/actions/deployedge/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ runs:
- run: |
$LBS_IMAGE_TAG=$(az acr repository show-tags --username ${{ env.CONTAINER_REGISTRY_USERNAME }} --password "${{ env.CONTAINER_REGISTRY_PASSWORD }}" --name ${{ env.CONTAINER_REGISTRY_ADDRESS }} --repository lorabasicsstation --orderby time_desc -o json | ConvertFrom-Json)[0]
echo $LBS_IMAGE_TAG
$LBS_IMAGE_TAG=$LBS_IMAGE_TAG.replace("-${{ inputs.architecture }}",'')
$LBS_IMAGE_TAG=$LBS_IMAGE_TAG.replace("-arm32v7",'')
$LBS_IMAGE_TAG=$LBS_IMAGE_TAG.replace("-arm64v8",'')
echo $LBS_IMAGE_TAG
echo "::set-env name=LBS_VERSION::$LBS_IMAGE_TAG"
shell: pwsh
Expand All @@ -65,8 +66,8 @@ runs:
shell: bash
run: |
az extension add --name azure-iot
until `az iot edge deployment show-metric --deployment-id $IOT_EDGE_DEPLOYMENT_ID --metric-id reportedSuccessfulCount --metric-type system --login $IOTHUB_CONNECTION_STRING | grep -q $DEVICE_ID`; do sleep 10 && echo "waiting for deployment to be applied"; done
until $(az iot hub module-twin show -m '\$edgeAgent' -d $DEVICE_ID --login $IOTHUB_CONNECTION_STRING | jq ".properties.desired.\"\$version\" == .properties.reported.lastDesiredVersion and .properties.reported.lastDesiredStatus.code == 200 and .configurations.$IOT_EDGE_DEPLOYMENT_ID.status == \"Applied\"" | grep -q true); do sleep 10 && echo "waiting for deployment to be applied"; done
- name: Wait for LNS start
if: inputs.waitForLnsDeployment == 'true'
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/iotedgedev/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# This file generate an IoT Edge deployment file using token replacement to replace secrets with environment variables
# then the file proceed to remove the previous deployment and replace it with the current one
sudo -E az extension add --name azure-iot
sudo -E iotedgedev genconfig -f $2/$1 -P $3 --fail-on-validation-error
sudo az extension add --name azure-iot
sudo -E az iot edge deployment delete --login "$IOTHUB_CONNECTION_STRING" --deployment-id "$IOT_EDGE_DEPLOYMENT_ID"
sudo -E az iot edge deployment create --login "$IOTHUB_CONNECTION_STRING" --content "config/${1//'.template'}" --deployment-id "$IOT_EDGE_DEPLOYMENT_ID" --target-condition "deviceId='$DEVICE_ID'"

8 changes: 7 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ updates:
directory: "/"
schedule:
interval: "daily"
# Maintain dependencies for universal decoder
# Maintain dependencies for universal decoder
- package-ecosystem: "npm"
directory: "/Samples/UniversalDecoder"
schedule:
interval: "daily"
# Maintain dependencies for github actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every weekday
interval: "daily"
22 changes: 12 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,19 @@ env:
AZURE_FUNCTIONAPP_NAME: loramoduleintegrationtest
TESTS_FOLDER: Tests
TESTS_RESULTS_FOLDER: Tests/TestResults
CONTAINER_REGISTRY_ADDRESS: "${{ secrets.CI_ACR_NAME }}.azurecr.io"
CONTAINER_REGISTRY_USERNAME: "${{ secrets.CI_ACR_NAME }}"
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.CI_ACR_CREDENTIALS }}

jobs:
build_and_test:
name: Build and Test Solution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
name: Checkout current branch

- uses: actions/setup-dotnet@v1
- uses: actions/setup-dotnet@v3.0.1
with:
dotnet-version: '6.0.x'

Expand Down Expand Up @@ -79,7 +82,7 @@ jobs:
${{ env.TESTS_FOLDER }}/Integration/LoRaWan.Tests.Integration.csproj
# Upload test results as artifact
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: success() || failure()
with:
name: test-results
Expand All @@ -88,28 +91,27 @@ jobs:
${{ env.TESTS_RESULTS_FOLDER }}/Integration
- name: Upload to Codecov test reports
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v3
with:
directory: Tests/

build_docker_images:
name: Build Docker Images
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
name: Checkout current branch

- uses: docker/setup-buildx-action@v1
- uses: docker/setup-buildx-action@v2
id: buildx
with:
install: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2

- name: Build docker images
run: |
docker buildx bake
echo ${{ env.CONTAINER_REGISTRY_PASSWORD }} | docker login "${{ env.CONTAINER_REGISTRY_ADDRESS }}" --username "${{ env.CONTAINER_REGISTRY_USERNAME }}" --password-stdin
docker buildx bake --set *.args.SOURCE_CONTAINER_REGISTRY_ADDRESS=${{ env.CONTAINER_REGISTRY_ADDRESS }}
working-directory: LoRaEngine
env:
CONTAINER_REGISTRY_ADDRESS: docker.io/test
16 changes: 8 additions & 8 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: csharp
queries: +security-and-quality,security-extended

- uses: actions/setup-dotnet@v1
- uses: actions/setup-dotnet@v3.0.1
with:
dotnet-version: '6.0.x'

Expand All @@ -38,7 +38,7 @@ jobs:
run: dotnet build --configuration Release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2

analyze_javascript:
name: Analyze Javascript
Expand All @@ -49,18 +49,18 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: javascript
queries: +security-and-quality,security-extended


- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
Loading

0 comments on commit 05f61b5

Please sign in to comment.