Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
craig8 committed Apr 1, 2024
2 parents 1ebc0b8 + 5b45014 commit dd37c24
Show file tree
Hide file tree
Showing 433 changed files with 7,415 additions and 12,876 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/code_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
schedule:
- cron: '25 18 * * 2'

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

jobs:
analyze:
name: Analyze
Expand Down
22 changes: 18 additions & 4 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 @@ -40,13 +54,13 @@ jobs:

# setup the python environment for the operating system
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
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@v5
uses: volttron/volttron-build-action@v6
with:
python_version: ${{ matrix.python-version }}
os: ${{ matrix.os }}
Expand All @@ -55,7 +69,7 @@ jobs:

# Archive the results from the pytest to storage.
- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
17 changes: 11 additions & 6 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 @@ -50,7 +55,7 @@ jobs:

# setup the python environment for the operating system
- name: Set up Python ${{matrix.os}} ${{ matrix.python-version }}
uses: actions/setup-python@v4
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@v5
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@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
16 changes: 10 additions & 6 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 @@ -40,7 +44,7 @@ jobs:
# 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@v4
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@v5
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@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/pytest-dbutils-mysqlfuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@

name: Testing mysqlfuncts
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 @@ -40,7 +44,7 @@ jobs:
# 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@v4
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@v5
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@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/pytest-dbutils-postgresqlfuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@

name: Testing postgresqlfuncts
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 @@ -40,7 +44,7 @@ jobs:
# 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@v4
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@v5
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@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/pytest-dbutils-sqlitefuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@

name: Testing sqlitefuncts
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:
env:
Expand All @@ -40,7 +43,7 @@ jobs:
# 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@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -51,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@v5
uses: volttron/volttron-build-action@v6
timeout-minutes: 600
with:
python_version: ${{ matrix.python-version }}
Expand All @@ -60,7 +63,7 @@ jobs:
test_output_suffix: ${{ env.OUTPUT_SUFFIX }}

- name: Archive test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: pytest-report
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/pytest-dbutils-timescaldbfuncts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@

name: Testing postgresql_timescaledb_functs
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:
env:
Expand All @@ -40,7 +43,7 @@ jobs:
# 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@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -50,7 +53,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@v5
uses: volttron/volttron-build-action@v6
timeout-minutes: 600
with:
python_version: ${{ matrix.python-version }}
Expand All @@ -60,7 +63,7 @@ jobs:

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

0 comments on commit dd37c24

Please sign in to comment.