Merge branch 'main' into feature/delegate-po-externally

minvws · Oct 3, 2023 · 15ca4ae · 15ca4ae
2 parents b452bfb + 388a65d
commit 15ca4ae
Show file tree

Hide file tree

Showing 75 changed files with 1,961 additions and 1,188 deletions.
diff --git a/.github/scripts/commit_sign_push.sh b/.github/scripts/commit_sign_push.sh
@@ -5,12 +5,12 @@
 
 FILES=$(git diff --name-only)
 for FILE in $FILES; do
-  CONTENT=$(base64 -i "$FILE")
-  SHA=$(git rev-parse "$DESTINATION_BRANCH":"$FILE")
-  gh api --method PUT /repos/:owner/:repo/contents/"$FILE" \
-    --field message="Update $FILE" \
-    --field content="$CONTENT" \
-    --field encoding="base64" \
-    --field branch="$DESTINATION_BRANCH" \
-    --field sha="$SHA"
+    CONTENT=$(base64 -i "$FILE")
+    SHA=$(git rev-parse "$DESTINATION_BRANCH":"$FILE")
+    gh api --method PUT /repos/:owner/:repo/contents/"$FILE" \
+        --field message="Update $FILE" \
+        --field content="$CONTENT" \
+        --field encoding="base64" \
+        --field branch="$DESTINATION_BRANCH" \
+        --field sha="$SHA"
 done
diff --git a/.github/workflows/boefjes_container_image.yml b/.github/workflows/boefjes_container_image.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/nl-kat-boefjes
@@ -31,7 +31,7 @@ jobs:
             type=ref,event=pr
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Login to GitHub Container Registry
@@ -49,7 +49,7 @@ jobs:
           cp _version.py boefjes/boefjes/katalogus/version.py
 
       - name: Build container image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           # We don't use git context because that doesn't process .dockerignore
           # https://github.com/docker/cli/issues/2827

diff --git a/.github/workflows/boefjes_tests.yml b/.github/workflows/boefjes_tests.yml
@@ -23,7 +23,7 @@ jobs:
       COMPOSE_FILE: .ci/docker-compose.yml
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/build-debian-docker-image.yml b/.github/workflows/build-debian-docker-image.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to the Container registry
         uses: docker/login-action@v2
@@ -39,7 +39,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@12cce9efe0d49980455aaaca9b071c0befcdd702
+        uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/nl-kat-${{ matrix.dist }}-build-image
@@ -51,7 +51,7 @@ jobs:
             type=sha
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./packaging/${{ matrix.dist }}
           push: true

diff --git a/.github/workflows/build-rdo-package.yml b/.github/workflows/build-rdo-package.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Prep Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/build_docs_on_pr.yml b/.github/workflows/build_docs_on_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/bytes_container_image.yml b/.github/workflows/bytes_container_image.yml
@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/nl-kat-bytes
@@ -29,7 +29,7 @@ jobs:
             type=ref,event=pr
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Login to GitHub Container Registry
@@ -46,7 +46,7 @@ jobs:
           cp _version.py bytes/bytes/version.py
 
       - name: Build container image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           # We don't use git context because that doesn't process .dockerignore
           # https://github.com/docker/cli/issues/2827

diff --git a/.github/workflows/bytes_tests.yml b/.github/workflows/bytes_tests.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run unit tests
         run: make utest build_args='--build-arg PYTHON_VERSION=${{ matrix.version }}'

diff --git a/.github/workflows/check_poetry_dependencies.yml b/.github/workflows/check_poetry_dependencies.yml
@@ -25,7 +25,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4

diff --git a/.github/workflows/debian_package.yml b/.github/workflows/debian_package.yml
@@ -63,7 +63,7 @@ jobs:
       PKG_NAME: kat-${{ matrix.package }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Generate version.py and set RELEASE_VERSION
         run: |

diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/keiko_container_image.yml b/.github/workflows/keiko_container_image.yml
@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/nl-kat-keiko
@@ -29,7 +29,7 @@ jobs:
             type=ref,event=pr
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Login to GitHub Container Registry
@@ -46,7 +46,7 @@ jobs:
           cp _version.py keiko/keiko/version.py
 
       - name: Build container image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           # We don't use git context because that doesn't process .dockerignore
           # https://github.com/docker/cli/issues/2827

diff --git a/.github/workflows/keiko_itest.yml b/.github/workflows/keiko_itest.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.8
         uses: actions/setup-python@v4

diff --git a/.github/workflows/keiko_test.yml b/.github/workflows/keiko_test.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.version }}
         uses: actions/setup-python@v4

diff --git a/.github/workflows/keiko_tex_linters.yml b/.github/workflows/keiko_tex_linters.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install chktex
         run: sudo apt-get install chktex

diff --git a/.github/workflows/masscan_container_image.yml b/.github/workflows/masscan_container_image.yml
@@ -25,10 +25,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Log in to the Container registry
@@ -40,7 +40,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@12cce9efe0d49980455aaaca9b071c0befcdd702
+        uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/nl-kat-masscan-build-image
@@ -52,7 +52,7 @@ jobs:
             type=sha
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./boefjes/images/masscan
           push: true

diff --git a/.github/workflows/mula_container_image.yml b/.github/workflows/mula_container_image.yml
@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/nl-kat-mula
@@ -29,7 +29,7 @@ jobs:
             type=ref,event=pr
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Login to GitHub Container Registry
@@ -46,7 +46,7 @@ jobs:
           cp _version.py mula/scheduler/version.py
 
       - name: Build container image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           # We don't use git context because that doesn't process .dockerignore
           # https://github.com/docker/cli/issues/2827

diff --git a/.github/workflows/mula_tests.yml b/.github/workflows/mula_tests.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build the images
         run: DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose -f base.yml -f .ci/docker-compose.yml build --build-arg PYTHON_VERSION=${{ matrix.version }}

diff --git a/.github/workflows/octopoes_container_image.yml b/.github/workflows/octopoes_container_image.yml
@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/nl-kat-octopoes
@@ -29,7 +29,7 @@ jobs:
             type=ref,event=pr
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Login to GitHub Container Registry
@@ -46,7 +46,7 @@ jobs:
           cp _version.py octopoes/octopoes/version.py
 
       - name: Build container image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           # We don't use git context because that doesn't process .dockerignore
           # https://github.com/docker/cli/issues/2827

diff --git a/.github/workflows/octopoes_rtest-crux-regression.yml b/.github/workflows/octopoes_rtest-crux-regression.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:
@@ -25,7 +25,7 @@ jobs:
         working-directory: ./octopoes
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Run robot tests on Crux (regression)

diff --git a/.github/workflows/octopoes_rtest.yml b/.github/workflows/octopoes_rtest.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:
@@ -25,7 +25,7 @@ jobs:
         working-directory: ./octopoes
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Run robot tests

diff --git a/.github/workflows/octopoes_tests.yml b/.github/workflows/octopoes_tests.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.version }}
         uses: actions/setup-python@v4

diff --git a/.github/workflows/pre_commit_checks.yml b/.github/workflows/pre_commit_checks.yml
@@ -6,7 +6,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4