Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into hotfix/modbustk
Browse files Browse the repository at this point in the history
  • Loading branch information
bonicim committed May 9, 2024
2 parents a2b1d08 + 5e77b59 commit 51eacea
Show file tree
Hide file tree
Showing 956 changed files with 52,671 additions and 200,190 deletions.
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Operating System (please complete the following information):**
- OS: [e.g. iOS]
- Volttron Version [develop, releases/8.2, main]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
74 changes: 74 additions & 0 deletions .github/workflows/code_analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ main, develop ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main, develop ]
schedule:
- cron: '25 18 * * 2'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
34 changes: 24 additions & 10 deletions .github/workflows/pytest-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,21 @@
name: Testing platform auth

# Determine what events are going to trigger a running of the workflow
on: [pull_request]
on:
workflow_dispatch:
push:
branches:
- develop
- releases/**
pull_request:
branches:
- main
- develop
- releases/**

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
# The job named build
Expand All @@ -25,8 +39,8 @@ jobs:
fail-fast: false
matrix:
# Each entry in the os and python-version matrix will be run so for the 3 x 4 there will be 12 jobs run
os: [ ubuntu-18.04, ubuntu-20.04 ]
python-version: [ 3.6, 3.7] # , 3.8, 3.9 ]
os: [ ubuntu-20.04 ]
python-version: [ 3.8 ]

# Run-on determines the operating system available to run on
# - At the current time there is only ubuntu machines between 16.04 and 20.04 available
Expand All @@ -36,17 +50,17 @@ jobs:
# Each step will be run in order of listing.
steps:
# checkout the volttron repository and set current direectory to it
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# setup the python environment for the operating system
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

# Run the specified tests and save the results to a unique file that can be archived for later analysis.
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
uses: volttron/volttron-build-action@v2
uses: volttron/volttron-build-action@v6
with:
python_version: ${{ matrix.python-version }}
os: ${{ matrix.os }}
Expand All @@ -55,20 +69,20 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
path: output/test-auth-${{matrix.os}}-${{ matrix.python-version }}-results.xml

# - name: Publish Unit Test Results
# uses: EnricoMi/publish-unit-test-result-action@v1.5
# if: always()
# with:
# github_token: ${{ secrets.WORKFLOW_ACCESS_TOKEN }}
# files: output/test-testutils*.xml


#-cov=com --cov-report=xml --cov-report=html
# pytest tests.py --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html
# - name: Lint with flake8
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/pytest-dbutils-backup_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,20 @@ name: Testing BackupDatabase

# Determine what events are going to trigger a running of the workflow
on:
workflow_dispatch:
push:
branches:
- develop
- releases/**
pull_request:
branches:
- main
- develop
- releases/**
- main
- develop
- releases/**

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
Expand All @@ -36,8 +41,8 @@ jobs:
fail-fast: false
matrix:
# Each entry in the os and python-version matrix will be run. For example, on a list of 3 os's and 4 python versions, 12 jobs will be run
os: [ ubuntu-18.04, ubuntu-20.04 ]
python-version: [ 3.6, 3.7] # , 3.8, 3.9 ]
os: [ ubuntu-20.04 ]
python-version: [ 3.8 ]

# Run-on determines the operating system available to run on
# - At the current time there is only ubuntu machines between 16.04 and 20.04 available
Expand All @@ -46,11 +51,11 @@ jobs:

steps:
# checkout the volttron repository and set current directory to it
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# setup the python environment for the operating system
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -60,7 +65,7 @@ jobs:
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
uses: volttron/volttron-build-action@v1
uses: volttron/volttron-build-action@v6
timeout-minutes: 600
with:
python_version: ${{ matrix.python-version }}
Expand All @@ -70,7 +75,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/pytest-dbutils-influxdbfuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@

name: Testing influxdbutils
on:
workflow_dispatch:
push:
branches:
- develop
- releases/**
pull_request:
branches:
- main
- develop
- releases/**
- main
- develop
- releases/**
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
Expand All @@ -28,19 +32,19 @@ jobs:
fail-fast: false
matrix:
# Each entry in the os and python-version matrix will be run so for the 3 x 4 there will be 12 jobs run
os: [ ubuntu-18.04, ubuntu-20.04 ]
python-version: [ 3.6, 3.7] # , 3.8, 3.9 ]
os: [ ubuntu-20.04 ]
python-version: [ 3.8 ]

runs-on: ${{ matrix.os }}

steps:
# checkout the volttron repository and set current directory to it
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Attempt to restore the cache from the build-dependency-cache workflow if present then
# the output value steps.check_files.outputs.files_exists will be set (see the next step for usage)
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -50,7 +54,7 @@ jobs:
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
uses: volttron/volttron-build-action@v1
uses: volttron/volttron-build-action@v6
timeout-minutes: 600
with:
python_version: ${{ matrix.python-version }}
Expand All @@ -60,7 +64,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
Loading

0 comments on commit 51eacea

Please sign in to comment.