-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next' into feature/app-pass-through
- Loading branch information
Showing
554 changed files
with
11,186 additions
and
318 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| name: Attempt to merge next to main | ||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| # Check if next can merge into main | ||
| check_merge: | ||
| name: Check if "next" can merge into "main" | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
| repo-token: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }} | ||
| persist-credentials: true | ||
|
|
||
| # Set user identity | ||
| - name: Set-Identity | ||
| run: | | ||
| git config --global user.email "${{ secrets.GLOBAL_GITHUB_EMAIL }}" | ||
| git config --global user.name "${{ secrets.GLOBAL_GITHUB_USER }}" | ||
| # Checkout "main" | ||
| - name: Checkout main | ||
| run: git checkout "main" | ||
|
|
||
| # Attempt a dry-run merge | ||
| - name: Attempt a dry-run merge | ||
| run: | | ||
| git merge --no-commit --no-ff origin/${{github.ref_name}} | ||
| exit $? | ||
| # Attempt to merge to main if our dry-run succeeded | ||
| process_merge_on_success: | ||
| name: Perform merge from "next" to "main" | ||
| needs: check_merge | ||
| runs-on: ubuntu-latest | ||
| if: ${{ success() }} | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
| repo-token: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }} | ||
| persist-credentials: true | ||
|
|
||
| # Set user identity | ||
| - name: Set-Identity | ||
| run: | | ||
| git config --global user.email "${{ secrets.GLOBAL_GITHUB_EMAIL }}" | ||
| git config --global user.name "${{ secrets.GLOBAL_GITHUB_USER }}" | ||
| # Checkout "main" | ||
| - name: Checkout main | ||
| run: git checkout "main" | ||
|
|
||
| - name: Perform the merge from next to main | ||
| run: | | ||
| git merge origin/next | ||
| merge_status=$? | ||
| git push origin "main" | ||
| push_status=$? | ||
| if [ "$merge_status" -eq 0 ] && [ "$push_status" -eq 0 ]; then | ||
| echo "Push to main succeeded" | ||
| exit 0 | ||
| else | ||
| exit 1 | ||
| fi | ||
| # If the merge cannot be performed, let stakeholders know | ||
| process_merge_on_failure: | ||
| name: Merge dry-run failure | ||
| needs: check_merge | ||
| runs-on: ubuntu-latest | ||
| if: ${{ failure() }} | ||
|
|
||
| steps: | ||
| - name: Post error message (To-Do) | ||
| run: echo "Next cannot be merged into main cleanly" | ||
|
|
||
| # If we attempted to merge/push to next-main but there was a failure | ||
| process_push_failure: | ||
| name: Merge failure | ||
| needs: process_merge_on_success | ||
| runs-on: ubuntu-latest | ||
| if: ${{ failure() && needs.process_merge_on_success.result != 'skipped' }} | ||
|
|
||
| steps: | ||
| - name: Post error message (To-Do) | ||
| run: echo "There was a failure when merging next into main" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| name: Attempt to merge next to next-major | ||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| branches: | ||
| - "next" | ||
|
|
||
| jobs: | ||
| # Check if next can merge into next-major | ||
| check_merge: | ||
| name: Check if "next" can merge into "next-major" | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
| repo-token: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }} | ||
| persist-credentials: true | ||
|
|
||
| # Set user identity | ||
| - name: Set-Identity | ||
| run: | | ||
| git config --global user.email "${{ secrets.GLOBAL_GITHUB_EMAIL }}" | ||
| git config --global user.name "${{ secrets.GLOBAL_GITHUB_USER }}" | ||
| # Checkout "next-major" | ||
| - name: Checkout next-major | ||
| run: git checkout "next-major" | ||
|
|
||
| # Get the "next-major" version number | ||
| - name: Extract next-major version | ||
| id: extract_version | ||
| run: echo "::set-output name=version::$(node -e 'console.log(require("./package.json").version)')" | ||
|
|
||
| # Checkout "next" | ||
| - name: Checkout next | ||
| run: git checkout "next" | ||
|
|
||
| # Update "next" version to match "next-major" | ||
| - name: Update "next" version to match "next-major" | ||
| run: | | ||
| jq '.version = "${{ steps.extract_version.outputs.version }}"' package.json > temp.json | ||
| if diff -q "package.json" "temp.json" >/dev/null; then | ||
| echo "Versions are identical. No change required." | ||
| rm temp.json | ||
| else | ||
| mv temp.json package.json | ||
| git add package.json && git commit -m "Sync version to ${{ steps.extract_version.outputs.version }}" | ||
| fi | ||
| # Checkout "next-major" | ||
| - name: Checkout next-major | ||
| run: git checkout "next-major" | ||
|
|
||
| # Attempt a dry-run merge | ||
| - name: Attempt a dry-run merge | ||
| run: | | ||
| git merge --no-commit --no-ff ${{github.ref_name}} | ||
| exit $? | ||
| # Attempt to merge to next-major if our dry-run succeeded | ||
| process_merge_on_success: | ||
| name: Perform merge from "next" to "next-major" | ||
| needs: check_merge | ||
| runs-on: ubuntu-latest | ||
| if: ${{ success() }} | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
| repo-token: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }} | ||
| persist-credentials: true | ||
|
|
||
| # Set user identity | ||
| - name: Set-Identity | ||
| run: | | ||
| git config --global user.email "${{ secrets.GLOBAL_GITHUB_EMAIL }}" | ||
| git config --global user.name "${{ secrets.GLOBAL_GITHUB_USER }}" | ||
| # Checkout "next-major" | ||
| - name: Checkout next-major | ||
| run: git checkout "next-major" | ||
|
|
||
| # Get the "next-major" version number | ||
| - name: Extract next-major version | ||
| id: extract_version | ||
| run: echo "::set-output name=version::$(node -e 'console.log(require("./package.json").version)')" | ||
|
|
||
| # Checkout "next" | ||
| - name: Checkout next | ||
| run: git checkout "next" | ||
|
|
||
| # Update "next" version to match "next-major" | ||
| - name: Update "next" version to match "next-major" | ||
| run: | | ||
| jq '.version = "${{ steps.extract_version.outputs.version }}"' package.json > temp.json | ||
| if diff -q "package.json" "temp.json" >/dev/null; then | ||
| echo "Versions are identical. No change required." | ||
| rm temp.json | ||
| else | ||
| mv temp.json package.json | ||
| git add package.json && git commit -m "Sync version to ${{ steps.extract_version.outputs.version }}" | ||
| fi | ||
| # Checkout "next-major" | ||
| - name: Checkout next-major | ||
| run: git checkout "next-major" | ||
|
|
||
| - name: Perform the merge from next to next-major | ||
| run: | | ||
| git merge next | ||
| merge_status=$? | ||
| git push origin "next-major" | ||
| push_status=$? | ||
| if [ "$merge_status" -eq 0 ] && [ "$push_status" -eq 0 ]; then | ||
| echo "Push to next-major succeeded" | ||
| exit 0 | ||
| else | ||
| exit 1 | ||
| fi | ||
| # If the merge cannot be performed, let stakeholders know | ||
| process_merge_on_failure: | ||
| name: Merge dry-run failure | ||
| needs: check_merge | ||
| runs-on: ubuntu-latest | ||
| if: ${{ failure() }} | ||
|
|
||
| steps: | ||
| - name: Post error message (To-Do) | ||
| run: echo "Next cannot be merged into next-major cleanly" | ||
|
|
||
| # If we attempted to merge/push to next-main but there was a failure | ||
| process_push_failure: | ||
| name: Merge failure | ||
| needs: process_merge_on_success | ||
| runs-on: ubuntu-latest | ||
| if: ${{ failure() && needs.process_merge_on_success.result != 'skipped' }} | ||
|
|
||
| steps: | ||
| - name: Post error message (To-Do) | ||
| run: echo "There was a failure when merging next into next-major" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,3 +4,4 @@ node_modules/* | |
| .DS_Store | ||
| .DS_Store | ||
| coverage | ||
| .vscode/settings.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "name": "C", | ||
| "langcode": "c", | ||
| "createModuleDirectories": false, | ||
| "extractSubSchemas": true, | ||
| "unwrapResultObjects": true, | ||
| "convertTuplesToArraysOrObjects": true, | ||
| "templatesPerModule": [ | ||
| "/include/module.h", | ||
| "/src/module.cpp" | ||
| ], | ||
| "templatesPerSchema": [ | ||
| "/include/common/module.h", | ||
| "/src/module_common.cpp", | ||
| "/src/jsondata_module.h" | ||
| ], | ||
| "persistPermission": true, | ||
| "primitives": { | ||
| "boolean": "bool", | ||
| "integer": "int", | ||
| "number": "float", | ||
| "string": "char*" | ||
| }, | ||
| "additionalSchemaTemplates": [ | ||
| "json-types" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* | ||
| * Copyright 2021 Comcast Cable Communications Management, LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| export { default as Transport } from './shared/Transport/index.mjs' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { default as ${info.title} } from './${info.title}/index.mjs' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| import { default as _${info.title} } from './${info.title}/defaults.mjs' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ${info.title}: _${info.title}, |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /* ${method.name} - ${method.description} */ | ||
| uint32_t ${info.title}_${method.Name}( ${method.signature.params} ) | ||
| { | ||
| const string method = _T("${info.title}.${method.name}"); | ||
| ${if.params} | ||
| ${method.params.serialization} | ||
| ${end.if.params} | ||
| return FireboltSDK::Properties::Set(method, jsonParameters); | ||
| } |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| /* | ||
| * ${method.summary} | ||
| * ${method.params} | ||
| */ | ||
| int F${info.title}_${method.Name}(${method.signature.params}${if.result.properties}${if.params}, ${end.if.params}${end.if.result.properties}${method.result.properties}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /* ${method.name} - ${method.description} */ | ||
| typedef void (*F${info.Title}${method.Name}Callback)( const void* userData, ${event.signature.callback.params}${if.event.params}, ${end.if.event.params}${method.result.properties} ); | ||
| int F${info.title}_Register_${method.Name}( ${event.signature.params}${if.event.params}, ${end.if.event.params}F${info.Title}${method.Name}Callback userCB, const void* userData ); | ||
| int F${info.title}_Unregister_${method.Name}( F${info.Title}${method.Name}Callback userCB); |
Empty file.
Empty file.
5 changes: 5 additions & 0 deletions
5
languages/c-structs/templates/declarations/polymorphic-reducer.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| /* | ||
| * ${method.summary} | ||
| * ${method.params} | ||
| */ | ||
| int F${info.title}_${method.Name}(${method.signature.params}${if.result.properties}${if.params}, ${end.if.params}${end.if.result.properties}${method.result.properties}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| /* | ||
| * ${method.summary} | ||
| * ${method.params} | ||
| */ | ||
| int F${info.title}_Get${method.Name}(${method.signature.params}${if.params}, ${end.if.params}${method.result.properties}); |
Empty file.
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #include "jsondata_${info.title.lowercase}.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #include "common/${info.title.lowercase}.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #include "jsondata_${info.title.lowercase}.h" |
1 change: 1 addition & 0 deletions
1
languages/c-structs/templates/json-types/additionalProperties.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // need cpp code to init, get, set, clear additional properties... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /* AnyOf is not supported in C: ${title} */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| uint32_t ${info.Title}_${Title}Array_Size(${type} handle); | ||
| ${type} ${title}Array_Get(${type} handle, uint32_t index); | ||
| void ${info.Title}_${Title}Array_Add(${propertyType} handle, ${valueType} value); | ||
| void ${info.Title}_${Title}Array_Clear(${propertyType} handle); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| WPEFramework::Core::JSON::Boolean |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ${shape} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /* ${title} ${description} */ | ||
| ENUM_CONVERSION_BEGIN(${name}) | ||
| { ${NAME}_${key}, _T("${value}") }, | ||
| ENUM_CONVERSION_END(${name}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /* ${title} ${description} */ | ||
| typedef enum { | ||
| ${NAME}_${key}, | ||
| } ${name}; |
Oops, something went wrong.