Merge branch 'master' into delete-old-files

Author: mishaschwartz

.bumpversion.cfg

@@ -0,0 +1,64 @@
+[tool.bumpversion]
+current_version = "2.16.12"
+commit = true
+tag = false
+tag_name = "{new_version}"
+allow_dirty = true
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
+serialize = [
+    "{major}.{minor}.{patch}",
+]
+
+[[tool.bumpversion.files]]
+filename = "CHANGES.md"
+search = """[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
+------------------------------------------------------------------------------------------------------------------"""
+replace = """[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
+------------------------------------------------------------------------------------------------------------------
+
+[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+
+[{new_version}](https://github.com/bird-house/birdhouse-deploy/tree/{new_version}) ({utcnow:%Y-%m-%d})
+------------------------------------------------------------------------------------------------------------------"""
+
+[[tool.bumpversion.files]]
+filename = "Makefile"
+part = "version"
+search = "APP_VERSION := {current_version}"
+replace = "APP_VERSION := {new_version}"
+
+[[tool.bumpversion.files]]
+filename = "README.rst"
+part = "version"
+search = "{current_version}"
+replace = "{new_version}"
+
+[[tool.bumpversion.files]]
+filename = "RELEASE.txt"
+part = "version"
+search = "{current_version}"
+replace = "{new_version}"
+
+[[tool.bumpversion.files]]
+filename = "RELEASE.txt"
+search = "\\d{{4}}-\\d{{2}}-\\d{{2}}T\\d{{2}}:\\d{{2}}:\\d{{2}}Z"
+replace = "{utcnow:%Y-%m-%dT%H:%M:%SZ}"
+regex = true
+
+[[tool.bumpversion.files]]
+filename = "birdhouse/components/canarie-api/docker_configuration.py.template"
+part = "version"
+search = "'version': '{current_version}'"
+replace = "'version': '{new_version}'"
+
+[[tool.bumpversion.files]]
+filename = "birdhouse/components/canarie-api/docker_configuration.py.template"
+search = "'releaseTime': '\\d{{4}}-\\d{{2}}-\\d{{2}}T\\d{{2}}:\\d{{2}}:\\d{{2}}Z'"
+replace = "'releaseTime': '{utcnow:%Y-%m-%dT%H:%M:%SZ}'"
+regex = true
+
+[[tool.bumpversion.files]]
+filename = "docs/source/conf.py"
+part = "version"
+search = "'{current_version}'"
+replace = "'{new_version}'"

.bumpversion.toml

@@ -0,0 +1,20 @@
+version: 2
+
+updates:
+  - package-ecosystem: github-actions
+    directory: /.github/workflows
+    schedule:
+      interval: "quarterly"
+    groups:
+      actions:
+        patterns:
+          - "*"
+
+  - package-ecosystem: pip
+    directory: /tests
+    schedule:
+      interval: "quarterly"
+    groups:
+      python:
+        patterns:
+          - "*"

.github/dependabot.yml

@@ -6,7 +6,7 @@ jobs:
   greeting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/first-interaction@v1
+    - uses: actions/first-interaction@753c925c8d1ac6fede23781875376600628d9b5d # v3.0.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         issue-message: >

.github/workflows/greetings.yml

@@ -6,12 +6,20 @@
 # https://github.com/actions/labeler/blob/master/README.md
 
 name: Labeler
-on: [pull_request]
+on:
+  # Note: potential security risk from this action using pull_request_target.
+  # Do not add actions in here which need a checkout of the repo, and do not use any caching in here.
+  # See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
 
 jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v2
+    - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/label.yml

@@ -1,21 +1,31 @@
 name: Unit tests
+
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+
+concurrency:
+  # For a given workflow, if we push to the same branch, cancel all previous builds on that branch except on master.
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+
 jobs:
   test:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up python for testing
-        uses: actions/setup-python@v4
+      - name: Checkout Repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+      - name: Set up Python3
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.11"
           cache: 'pip'
-      - name: Install python test dependencies
+      - name: Install Python CI Dependencies
         run: |
-          pip install -r ./tests/requirements.txt
+          python -m pip install --require-hashes -r ./tests/requirements.txt
       - name: Test with pytest
         run: |
-          pytest ./tests/unit
+          python -m pytest ./tests/unit

.github/workflows/tests.yml

@@ -3,6 +3,7 @@ birdhouse/env.local
 birdhouse/certkey.pem
 birdhouse/cert.pem
 birdhouse/key.pem
+birdhouse/restic.env
 
 ## Deployment
 vagrant_variables.yml