Skip to content

Commit

Permalink
Merge branch 'main' into autogain
Browse files Browse the repository at this point in the history
  • Loading branch information
kx1t committed Nov 1, 2023
2 parents c0251de + 809b3c7 commit f00e84b
Show file tree
Hide file tree
Showing 23 changed files with 1,838 additions and 214 deletions.
1 change: 1 addition & 0 deletions .dictionary.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
crate
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
.github
.gitattributes
READMETEMPLATE.md
README.md
README.md
2 changes: 1 addition & 1 deletion .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ updates:
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: daily
interval: weekly
assignees:
- "fredclausen"

Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/cancel_dupes.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
---

# Cancels duplicate github actions when superseded

name: Cancelling Duplicates
on:
workflow_run:
workflows:
- 'Pull Request'
- 'Deploy'
- 'Linting (Non-Image)'
types: ['requested']
- "Pull Request"
- "Deploy"
- "Linting (Non-Image)"
types: ["requested"]

jobs:
cancel-duplicate-workflow-runs:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/check_versions.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

name: Check upstream versions

on:
Expand All @@ -8,7 +7,6 @@ on:
- cron: "0 12 * * *"

jobs:

version_in_container:
name: Check version in 'latest' image
runs-on: ubuntu-latest
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@ on:
- main

# Don't trigger if it's just a documentation update
paths-ignore:
- "**.md"
- "**.MD"
- "**.yml"
- "LICENSE"
- ".gitattributes"
- ".gitignore"
- ".dockerignore"
paths:
- "rust/**"
- "Dockerfile**"
- "rootfs/**"

jobs:
workflow-dispatch:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ on:
branches:
- main
paths:
- '**.py'
- "**.py"

jobs:

flake8-lint:
name: Run flake8 against python files
runs-on: ubuntu-latest
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ on:
branches:
- main
paths:
- 'Dockerfile'
- "Dockerfile"

jobs:

hadolint:
name: Run hadolint against docker files
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
- main
# only run these if markdown files are updated
paths:
- '**.md'
- '**.MD'
- "**.md"
- "**.MD"

jobs:
markdownlint:
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/on_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@ on:
- main
# Don't trigger if it's just a documentation update
paths-ignore:
- '**.md'
- '**.MD'
- '**.yml'
- 'LICENSE'
- '.gitattributes'
- '.gitignore'
- '.dockerignore'
- "**.md"
- "**.MD"
- "**.yml"
- "LICENSE"
- ".gitattributes"
- ".gitignore"
- ".dockerignore"

jobs:

test-build:
name: Test
uses: sdr-enthusiasts/common-github-workflows/.github/workflows/build_and_push_image.yml@main
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/pre-commit-updates.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Update pre-commit hooks

on:
workflow_dispatch:
schedule:
- cron: 0 0 * * 0

jobs:
update:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.0
with:
fetch-depth: 0
- uses: vrslev/pre-commit-autoupdate@v1.0.0
- uses: peter-evans/create-pull-request@v5
with:
branch: pre-commit-autoupdate
title: "chore(deps): Update pre-commit hooks"
commit-message: "chore(deps): Update pre-commit hooks"
body: Update pre-commit hooks
labels: dependencies
delete-branch: True
2 changes: 1 addition & 1 deletion .github/workflows/yamllint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main
# only run when yaml files are updated
paths:
- '**.yml'
- "**.yml"

jobs:
yamllint:
Expand Down
2 changes: 1 addition & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"MD033": false,
"MD013": false
}
}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ repos:

# lint python formatting
- repo: https://github.com/psf/black
rev: 23.10.0
rev: 23.10.1
hooks:
- id: black

Expand Down
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# Declare the telegraf image so we can copy telegraf binary out of it,
# and avoid headache of having to add apt key / apt repo and/or build from src.
# hadolint ignore=DL3008,SC2086,SC2039,SC2068,DL3006
FROM telegraf AS telegraf
RUN touch /tmp/.nothing
# Declare the wreadsb image so we can copy readsb binary out of it,
# and avoid headache of having to add apt key / apt repo and/or build from src.
# hadolint ignore=DL3008,SC2086,SC2039,SC2068,DL3006
FROM ghcr.io/sdr-enthusiasts/docker-baseimage:wreadsb as wreadsb
RUN touch /tmp/.nothing

# Build final image
# hadolint ignore=DL3008,SC2086,SC2039,SC2068,DL3006
FROM ghcr.io/sdr-enthusiasts/docker-baseimage:dump978-full

ENV PROMETHEUSPORT=9273 \
Expand All @@ -22,6 +25,7 @@ COPY --from=telegraf /usr/bin/telegraf /usr/bin/telegraf
# Copy wreadsb
COPY --from=wreadsb /usr/local/bin/readsb /usr/bin/readsb

# hadolint ignore=DL3008,SC2086,SC2039,SC2068
RUN set -x && \
TEMP_PACKAGES=() && \
KEPT_PACKAGES=() && \
Expand Down
Loading

0 comments on commit f00e84b

Please sign in to comment.