Skip to content

Commit

Permalink
No vis 1 (#517)
Browse files Browse the repository at this point in the history
* Do not load vis-1 widgets if vis-2 widgets provided

* Copyright

* Copyright

* Added packages to dependebot
  • Loading branch information
GermanBluefox authored Jan 23, 2025
1 parent 43d312f commit ff424c8
Show file tree
Hide file tree
Showing 66 changed files with 68,192 additions and 68,025 deletions.
9 changes: 4 additions & 5 deletions .github/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
- match:
# Only merge patches for production dependencies
dependency_type: production
update_type: "semver:patch"
update_type: 'semver:patch'
- match:
# Except for security fixes, here we allow minor patches
dependency_type: production
update_type: "security:minor"
update_type: 'security:minor'
- match:
# and development dependencies can have a minor update, too
dependency_type: development
update_type: "semver:minor"

update_type: 'semver:minor'
# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see:
# https://dependabot.com/docs/config-file/#automerged_updates
# https://dependabot.com/docs/config-file/#automerged_updates
60 changes: 38 additions & 22 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
time: "04:00"
timezone: Europe/Berlin
- package-ecosystem: npm
directory: "/"
schedule:
interval: monthly
time: "04:00"
timezone: Europe/Berlin
open-pull-requests-limit: 5
versioning-strategy: increase
- package-ecosystem: npm
directory: "/src"
schedule:
interval: monthly
time: "04:00"
timezone: Europe/Berlin
open-pull-requests-limit: 5
versioning-strategy: increase
- package-ecosystem: github-actions
directory: '/'
schedule:
interval: monthly
time: '04:00'
timezone: Europe/Berlin
- package-ecosystem: npm
directory: '/'
schedule:
interval: monthly
time: '04:00'
timezone: Europe/Berlin
open-pull-requests-limit: 5
versioning-strategy: increase
- package-ecosystem: npm
directory: 'packages/iobroker.vis-2'
schedule:
interval: monthly
time: '04:00'
timezone: Europe/Berlin
open-pull-requests-limit: 5
versioning-strategy: increase
- package-ecosystem: npm
directory: 'packages/iobroker.vis-2/src-vis'
schedule:
interval: monthly
time: '04:00'
timezone: Europe/Berlin
open-pull-requests-limit: 5
versioning-strategy: increase
- package-ecosystem: npm
directory: 'packages/types-vis-2'
schedule:
interval: monthly
time: '04:00'
timezone: Europe/Berlin
open-pull-requests-limit: 5
versioning-strategy: increase
49 changes: 24 additions & 25 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ onlyLabels: []

# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- enhancement
- security
- bug
- enhancement
- security
- bug

# Set to true to ignore issues in a project (defaults to false)
exemptProjects: true
Expand All @@ -30,42 +30,41 @@ staleLabel: wontfix

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs within the next 7 days.
Please check if the issue is still relevant in the most current version of the adapter
and tell us. Also check that all relevant details, logs and reproduction steps
are included and update them if needed.
Thank you for your contributions.
Dieses Problem wurde automatisch als veraltet markiert, da es in letzter Zeit keine Aktivitäten gab.
Es wird geschlossen, wenn nicht innerhalb der nächsten 7 Tage weitere Aktivitäten stattfinden.
Bitte überprüft, ob das Problem auch in der aktuellsten Version des Adapters noch relevant ist,
und teilt uns dies mit. Überprüft auch, ob alle relevanten Details, Logs und Reproduktionsschritte
enthalten sind bzw. aktualisiert diese.
Vielen Dank für Eure Unterstützung.
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs within the next 7 days.
Please check if the issue is still relevant in the most current version of the adapter
and tell us. Also check that all relevant details, logs and reproduction steps
are included and update them if needed.
Thank you for your contributions.
Dieses Problem wurde automatisch als veraltet markiert, da es in letzter Zeit keine Aktivitäten gab.
Es wird geschlossen, wenn nicht innerhalb der nächsten 7 Tage weitere Aktivitäten stattfinden.
Bitte überprüft, ob das Problem auch in der aktuellsten Version des Adapters noch relevant ist,
und teilt uns dies mit. Überprüft auch, ob alle relevanten Details, Logs und Reproduktionsschritte
enthalten sind bzw. aktualisiert diese.
Vielen Dank für Eure Unterstützung.
# Comment to post when removing the stale label.
# unmarkComment: >
# Your comment here.

# Comment to post when closing a stale Issue or Pull Request.
closeComment: >
This issue has been automatically closed because of inactivity. Please open a new
issue if still relevant and make sure to include all relevant details, logs and
reproduction steps.
Thank you for your contributions.
This issue has been automatically closed because of inactivity. Please open a new
issue if still relevant and make sure to include all relevant details, logs and
reproduction steps.
Thank you for your contributions.
Dieses Problem wurde aufgrund von Inaktivität automatisch geschlossen. Bitte öffnet ein
neues Issue, falls dies noch relevant ist und stellt sicher das alle relevanten Details,
Logs und Reproduktionsschritte enthalten sind.
Vielen Dank für Eure Unterstützung.
Dieses Problem wurde aufgrund von Inaktivität automatisch geschlossen. Bitte öffnet ein
neues Issue, falls dies noch relevant ist und stellt sicher das alle relevanten Details,
Logs und Reproduktionsschritte enthalten sind.
Vielen Dank für Eure Unterstützung.
# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30

# Limit to only `issues` or `pulls`
only: issues

# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
# pulls:
# daysUntilStale: 30
Expand Down
64 changes: 32 additions & 32 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
name: "CodeQL"
name: 'CodeQL'

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
schedule:
- cron: "46 19 * * 0"
push:
branches: ['master']
pull_request:
branches: ['master']
schedule:
- cron: '46 19 * * 0'

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

strategy:
fail-fast: false
matrix:
language: [ javascript ]
strategy:
fail-fast: false
matrix:
language: [javascript]

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
queries: +security-and-quality
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{ matrix.language }}"
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: '/language:${{ matrix.language }}'
26 changes: 13 additions & 13 deletions .github/workflows/dependabot-automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
name: Auto-Merge Dependabot PRs

on:
pull_request_target:
pull_request_target:

jobs:
auto-merge:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
auto-merge:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Check if PR should be auto-merged
uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
# This must be a personal access token with push access
github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
# By default, squash and merge, so Github chooses nice commit messages
command: squash and merge
- name: Check if PR should be auto-merged
uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
# This must be a personal access token with push access
github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
# By default, squash and merge, so Github chooses nice commit messages
command: squash and merge
Loading

0 comments on commit ff424c8

Please sign in to comment.