pull trixie into main

mmguero · mmguero · commit b51419f5a213 · 2025-08-28T17:46:36.000Z
diff --git a/.github/workflows/api-build-and-push-ghcr.yml b/.github/workflows/api-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'api/**'
diff --git a/.github/workflows/arkime-build-and-push-ghcr.yml b/.github/workflows/arkime-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'arkime/**'
diff --git a/.github/workflows/dashboards-build-and-push-ghcr.yml b/.github/workflows/dashboards-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'dashboards/**'
diff --git a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'dashboards/**'
diff --git a/.github/workflows/dirinit-build-and-push-ghcr.yml b/.github/workflows/dirinit-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'Dockerfiles/dirinit.Dockerfile'
diff --git a/.github/workflows/file-monitor-build-and-push-ghcr.yml b/.github/workflows/file-monitor-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'file-monitor/**'
diff --git a/.github/workflows/file-upload-build-and-push-ghcr.yml b/.github/workflows/file-upload-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'file-upload/**'
diff --git a/.github/workflows/filebeat-build-and-push-ghcr.yml b/.github/workflows/filebeat-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'filebeat/**'
diff --git a/.github/workflows/freq-build-and-push-ghcr.yml b/.github/workflows/freq-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'freq-server/**'
diff --git a/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml b/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'hedgehog-iso/**'
diff --git a/.github/workflows/hedgehog-raspi-build-docker-wrap-push-ghcr.yml b/.github/workflows/hedgehog-raspi-build-docker-wrap-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'hedgehog-iso/**'
diff --git a/.github/workflows/htadmin-build-and-push-ghcr.yml b/.github/workflows/htadmin-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'htadmin/**'
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -6,7 +6,6 @@ on:
   push:
     branches:
       - main
-      - trixie
     paths:
       - 'docs/**'
       - 'README.md'
diff --git a/.github/workflows/keycloak-build-and-push-ghcr.yml b/.github/workflows/keycloak-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'keycloak/**'
diff --git a/.github/workflows/logstash-build-and-push-ghcr.yml b/.github/workflows/logstash-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'logstash/**'
diff --git a/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml b/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'malcolm-iso/**'
diff --git a/.github/workflows/netbox-build-and-push-ghcr.yml b/.github/workflows/netbox-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'netbox/**'
diff --git a/.github/workflows/nginx-build-and-push-ghcr.yml b/.github/workflows/nginx-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'nginx/**'
diff --git a/.github/workflows/opensearch-build-and-push-ghcr.yml b/.github/workflows/opensearch-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'Dockerfiles/opensearch.Dockerfile'
diff --git a/.github/workflows/pcap-capture-build-and-push-ghcr.yml b/.github/workflows/pcap-capture-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'pcap-capture/**'
diff --git a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'pcap-monitor/**'
diff --git a/.github/workflows/postgresql-build-and-push-ghcr.yml b/.github/workflows/postgresql-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'Dockerfiles/postgresql.Dockerfile'
diff --git a/.github/workflows/redis-build-and-push-ghcr.yml b/.github/workflows/redis-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'redis-scripts/container_health.sh'
diff --git a/.github/workflows/suricata-build-and-push-ghcr.yml b/.github/workflows/suricata-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'suricata/**'
diff --git a/.github/workflows/zeek-build-and-push-ghcr.yml b/.github/workflows/zeek-build-and-push-ghcr.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - trixie
       - staging
     paths:
       - 'zeek/**'
