Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/publish-api
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisdutz committed Mar 24, 2024
2 parents 6e9b727 + 57a0f62 commit 1f8885c
Show file tree
Hide file tree
Showing 4,304 changed files with 588,266 additions and 76,945 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
36 changes: 18 additions & 18 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,27 @@ github:

# Attempt to make the auto-generated github emails more easily readable in email clients.
custom_subjects:
new_pr: "[PR] {title} ({repository})"
close_pr: "Re: [PR] {title} ({repository})"
comment_pr: "Re: [PR] {title} ({repository})"
diffcomment: "Re: [PR] {title} ({repository})"
merge_pr: "Re: [PR] {title} ({repository})"
new_issue: "[I] {title} ({repository})"
comment_issue: "Re: [I] {title} ({repository})"
close_issue: "Re: [I] {title} ({repository})"
catchall: "[GH] {title} ({repository})"
new_discussion: "[D] {title} ({repository})"
edit_discussion: "Re: [D] {title} ({repository})"
close_discussion: "Re: [D] {title} ({repository})"
close_discussion_with_comment: "Re: [D] {title} ({repository})"
reopen_discussion: "Re: [D] {title} ({repository})"
new_comment_discussion: "Re: [D] {title} ({repository})"
edit_comment_discussion: "Re: [D] {title} ({repository})"
delete_comment_discussion: "Re: [D] {title} ({repository})"
new_pr: "[PR] {title}"
close_pr: "Re: [PR] {title}"
comment_pr: "Re: [PR] {title}"
diffcomment: "Re: [PR] {title}"
merge_pr: "Re: [PR] {title}"
new_issue: "[I] {title}"
comment_issue: "Re: [I] {title}"
close_issue: "Re: [I] {title}"
catchall: "[GH] {title}"
new_discussion: "[D] {title}"
edit_discussion: "Re: [D] {title}"
close_discussion: "Re: [D] {title}"
close_discussion_with_comment: "Re: [D] {title}"
reopen_discussion: "Re: [D] {title}"
new_comment_discussion: "Re: [D] {title}"
edit_comment_discussion: "Re: [D] {title}"
delete_comment_discussion: "Re: [D] {title}"

notifications:
commits: [email protected]
issues: dev@plc4x.apache.org
issues: issues@plc4x.apache.org
discussions: [email protected]
pullrequests_status: [email protected]
pullrequests_comment: [email protected]
Expand Down
12 changes: 6 additions & 6 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Dockerfile
.dockerignore
.git/**
**/target/**
sandbox/plc4py/.eggs
sandbox/plc4py/.pytest_cache
sandbox/plc4py/build
sandbox/plc4py/dist
sandbox/plc4py/plc4py.egg-info
sandbox/plc4py/venv
plc4py/.eggs
plc4py/.pytest_cache
plc4py/build
plc4py/dist
plc4py/plc4py.egg-info
plc4py/venv
19 changes: 11 additions & 8 deletions .github/workflows/c-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ on:
required: false
default: 'false'

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

jobs:
test:
strategy:
Expand All @@ -56,17 +59,17 @@ jobs:
run: brew install libpcap

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

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-package: jdk
java-version: ${{ matrix.java }}

- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -75,7 +78,7 @@ jobs:
- name: Set Platform options
id: platform_opts
uses: actions/github-script@v6.4.1
uses: actions/github-script@v7.0.1
env:
OS: ${{ matrix.os }}
with:
Expand All @@ -93,7 +96,7 @@ jobs:
- name: Calculate platform suffix
id: platform_suffix
uses: actions/github-script@v6.4.1
uses: actions/github-script@v7.0.1
env:
OS: ${{ matrix.os }}
with:
Expand All @@ -107,7 +110,7 @@ jobs:
- name: Set extra options
id: extra_options
uses: actions/github-script@v6.4.1
uses: actions/github-script@v7.0.1
env:
FORCE_UPDATE: ${{ github.event.inputs.forceUpdates }}
with:
Expand All @@ -122,8 +125,8 @@ jobs:
# Note: due to github has no concept of recovering from a fail even if we have our fallback below we append a second un-parallel run behind this to be sure that it works with all checks. Only if that fails too we are ok with a "red" (which should be yellow) cross indicating a problem
- name: Run mvnw
run: |
./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-c,enable-all-checks' -pl :plc4c -am ${{ steps.platform_opts.outputs.platform_opts }} install
./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-c,enable-all-checks,update-generated-code' -pl :plc4c -am ${{ steps.platform_opts.outputs.platform_opts }} install
- name: Run mvnv without BacNet regression tests
if: ${{ failure() }}
run: ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-c,skip-bacnet-regression-test' -pl :plc4c -am ${{ steps.platform_opts.outputs.platform_opts }} install
run: ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-c,skip-bacnet-regression-test,update-generated-code' -pl :plc4c -am ${{ steps.platform_opts.outputs.platform_opts }} install
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
generate-changelog:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: BobAnkh/[email protected]
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ on:
schedule:
- cron: '17 19 * * 3'

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

jobs:
analyze:
name: Analyze
Expand All @@ -41,11 +44,11 @@ jobs:

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

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +59,7 @@ jobs:
# 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
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -70,4 +73,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
7 changes: 5 additions & 2 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
name: 'Dependency Review'
on: [pull_request]

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

permissions:
contents: read

Expand All @@ -34,6 +37,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
uses: actions/dependency-review-action@v4
4 changes: 4 additions & 0 deletions .github/workflows/go-platform-test-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ on:
workflows: [ 'Go Platform compatibility' ]
types:
- completed

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

jobs:
report:
strategy:
Expand Down
30 changes: 18 additions & 12 deletions .github/workflows/go-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ on:
description: "sets tracing for executor workers"
required: false
default: 'false'
traceTestTransportInstance:
description: "sets tracing for test transport instance"
required: false
default: 'false'

env:
PLC4X_TEST_HIGH_TEST_LOG_PRECISION: ${{ github.event.inputs.highLogPrecision }}
Expand All @@ -73,6 +77,8 @@ env:
PLC4X_TEST_TRACE_TRANSACTION_MANAGER_TRANSACTIONS: ${{ github.event.inputs.traceTransactionManagerTransactions }}
PLC4X_TEST_TRACE_DEFAULT_MESSAGE_CODEC_WORKER: ${{ github.event.inputs.traceDefaultMessageCodecWorker }}
PLC4X_TEST_TRACE_EXECUTOR_WORKERS: ${{ github.event.inputs.traceExecutorWorkers }}
PLC4X_TEST_TEST_TRANSPORT_INSTANCE: ${{ github.event.inputs.traceTestTransportInstance }}
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

jobs:
test:
Expand All @@ -97,17 +103,17 @@ jobs:
run: choco install -y nmap

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

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-package: jdk
java-version: ${{ matrix.java }}

- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -116,7 +122,7 @@ jobs:
- name: Set Platform options
id: platform_opts
uses: actions/github-script@v6.4.1
uses: actions/github-script@v7.0.1
env:
OS: ${{ matrix.os }}
with:
Expand All @@ -134,7 +140,7 @@ jobs:
- name: Calculate platform suffix
id: platform_suffix
uses: actions/github-script@v6.4.1
uses: actions/github-script@v7.0.1
env:
OS: ${{ matrix.os }}
with:
Expand All @@ -148,7 +154,7 @@ jobs:
- name: Set extra options
id: extra_options
uses: actions/github-script@v6.4.1
uses: actions/github-script@v7.0.1
env:
FORCE_UPDATE: ${{ github.event.inputs.forceUpdates }}
with:
Expand All @@ -161,7 +167,7 @@ jobs:
}
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: go

Expand All @@ -173,10 +179,10 @@ jobs:
# Note: due to github has no concept of recovering from a fail even if we have our fallback below we append a second un-parallel run behind this to be sure that it works with all checks. Only if that fails too we are ok with a "red" (which should be yellow) cross indicating a problem
- name: Run mvnw
run: |
./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-go,enable-all-checks' -pl :plc4go -am ${{ steps.platform_opts.outputs.platform_opts }} install
./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-go,enable-all-checks,update-generated-code' -pl :plc4go -am ${{ steps.platform_opts.outputs.platform_opts }} install
- name: Upload Test Report (first failure)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: "golang-test-report-first-failure-${{ matrix.os }}"
Expand All @@ -186,10 +192,10 @@ jobs:
- name: Run mvnv without BacNet regression tests
if: ${{ failure() }}
run: ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-go,skip-bacnet-regression-test' -pl :plc4go -am ${{ steps.platform_opts.outputs.platform_opts }} install
run: ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-go,skip-bacnet-regression-test,update-generated-code' -pl :plc4go -am ${{ steps.platform_opts.outputs.platform_opts }} install

- name: Upload Test Report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: "golang-test-report-${{ matrix.os }}"
Expand All @@ -198,4 +204,4 @@ jobs:
**/reports/test-out-verbose.log
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 5 additions & 1 deletion .github/workflows/java-platform-test-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@ on:
workflows: [ 'Java Platform compatibility' ]
types:
- completed

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

jobs:
report:
strategy:
matrix:
java: [ 11, 17, 18 ]
java: [ 11, 17, 21 ]
# TODO: only works on windows due to https://github.com/dorny/test-reporter/issues/249
#os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ windows-latest ]
Expand Down
Loading

0 comments on commit 1f8885c

Please sign in to comment.