Prepare branch renaming for dev and 1.6

.github/dependabot.yml

@@ -198,3 +198,202 @@ updates:
     commit-message:
       prefix: "deps/terraform"
     target-branch: "dev"
+
+  # 1.5 branch
+  # GHA
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/gha"
+    target-branch: "1.5"
+
+  # Linux
+  - package-ecosystem: "docker"
+    directory: "/src/linux"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/linux"
+    target-branch: "1.5"
+  - package-ecosystem: "docker"
+    directory: "/tests/linux"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/tests/linux"
+    target-branch: "1.5"
+
+  # BW
+  - package-ecosystem: "docker"
+    directory: "/src/bw"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/bw"
+    target-branch: "1.5"
+
+  # Scheduler
+  - package-ecosystem: "docker"
+    directory: "/src/scheduler"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/scheduler"
+    target-branch: "1.5"
+  - package-ecosystem: "pip"
+    directory: "/src/scheduler"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/scheduler"
+    target-branch: "1.5"
+
+  # Autoconf
+  - package-ecosystem: "docker"
+    directory: "/src/autoconf"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/autoconf"
+    target-branch: "1.5"
+  - package-ecosystem: "pip"
+    directory: "/src/autoconf"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/autoconf"
+    target-branch: "1.5"
+
+  # UI
+  - package-ecosystem: "docker"
+    directory: "/src/ui"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/ui"
+    target-branch: "1.5"
+  - package-ecosystem: "pip"
+    directory: "/src/ui"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/ui"
+    target-branch: "1.5"
+
+  # Misc
+  - package-ecosystem: "pip"
+    directory: "/src/deps"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/deps"
+    target-branch: "1.5"
+  - package-ecosystem: "pip"
+    directory: "/src/common/gen"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/common/gen"
+    target-branch: "1.5"
+  - package-ecosystem: "pip"
+    directory: "/src/common/db"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "TheophileDiot"
+    reviewers:
+      - "TheophileDiot"
+    commit-message:
+      prefix: "deps/common/db"
+    target-branch: "1.5"
+
+  # Terraform
+  - package-ecosystem: "terraform"
+    directory: "/tests/terraform"
+    schedule:
+      interval: "daily"
+      time: "09:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "fl0ppy-d1sk"
+    reviewers:
+      - "fl0ppy-d1sk"
+    commit-message:
+      prefix: "deps/terraform"
+    target-branch: "1.5"

.github/workflows/1.5.yml

@@ -4,7 +4,7 @@ permissions: read-all
 
 on:
   push:
-    branches: [1.6]
+    branches: [1.5]
 
 jobs:
   # Containers
@@ -27,7 +27,7 @@ jobs:
             dockerfile: src/ui/Dockerfile
     uses: ./.github/workflows/container-build.yml
     with:
-      RELEASE: 1.6
+      RELEASE: 1.5
       ARCH: linux/amd64
       CACHE: true
       IMAGE: ${{ matrix.image }}
@@ -59,7 +59,7 @@ jobs:
             package: rpm
     uses: ./.github/workflows/linux-build.yml
     with:
-      RELEASE: 1.6
+      RELEASE: 1.5
       LINUX: ${{ matrix.linux }}
       PACKAGE: ${{ matrix.package }}
       TEST: true
@@ -96,7 +96,7 @@ jobs:
     uses: ./.github/workflows/tests-ui.yml
     with:
       TEST: ${{ matrix.test }}
-      RELEASE: 1.6
+      RELEASE: 1.5
   tests-ui-linux:
     needs: [prepare-tests-ui, build-packages]
     strategy:
@@ -106,7 +106,7 @@ jobs:
     uses: ./.github/workflows/tests-ui-linux.yml
     with:
       TEST: ${{ matrix.test }}
-      RELEASE: 1.6
+      RELEASE: 1.5
 
   # Core tests
   prepare-tests-core:
@@ -129,7 +129,7 @@ jobs:
     uses: ./.github/workflows/test-core.yml
     with:
       TEST: ${{ matrix.test }}
-      RELEASE: 1.6
+      RELEASE: 1.5
   tests-core-linux:
     needs: [build-packages, prepare-tests-core]
     strategy:
@@ -139,11 +139,11 @@ jobs:
     uses: ./.github/workflows/test-core-linux.yml
     with:
       TEST: ${{ matrix.test }}
-      RELEASE: 1.6
+      RELEASE: 1.5
     secrets: inherit
 
-  # Push with 1.6 tag
-  push-1_6:
+  # Push with 1.5 tag
+  push-1_5:
     needs: [tests-ui, tests-core]
     runs-on: ubuntu-latest
     permissions:
@@ -162,22 +162,22 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push BW image
-        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.6 && docker tag ghcr.io/bunkerity/$FROM-tests:1.6 bunkerity/$TO:1.6 && docker tag ghcr.io/bunkerity/$FROM-tests:1.6 ghcr.io/bunkerity/$TO:1.6 && docker push bunkerity/$TO:1.6 && docker push ghcr.io/bunkerity/$TO:1.6
+        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 bunkerity/$TO:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 ghcr.io/bunkerity/$TO:1.5 && docker push bunkerity/$TO:1.5 && docker push ghcr.io/bunkerity/$TO:1.5
         env:
           FROM: "bunkerweb"
           TO: "bunkerweb"
       - name: Push scheduler image
-        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.6 && docker tag ghcr.io/bunkerity/$FROM-tests:1.6 bunkerity/$TO:1.6 && docker tag ghcr.io/bunkerity/$FROM-tests:1.6 ghcr.io/bunkerity/$TO:1.6 && docker push bunkerity/$TO:1.6 && docker push ghcr.io/bunkerity/$TO:1.6
+        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 bunkerity/$TO:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 ghcr.io/bunkerity/$TO:1.5 && docker push bunkerity/$TO:1.5 && docker push ghcr.io/bunkerity/$TO:1.5
         env:
           FROM: "scheduler"
           TO: "bunkerweb-scheduler"
       - name: Push UI image
-        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.6 && docker tag ghcr.io/bunkerity/$FROM-tests:1.6 bunkerity/$TO:1.6 && docker tag ghcr.io/bunkerity/$FROM-tests:1.6 ghcr.io/bunkerity/$TO:1.6 && docker push bunkerity/$TO:1.6 && docker push ghcr.io/bunkerity/$TO:1.6
+        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 bunkerity/$TO:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 ghcr.io/bunkerity/$TO:1.5 && docker push bunkerity/$TO:1.5 && docker push ghcr.io/bunkerity/$TO:1.5
         env:
           FROM: "ui"
           TO: "bunkerweb-ui"
       - name: Push autoconf image
-        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.6 && docker tag ghcr.io/bunkerity/$FROM-tests:1.6 bunkerity/$TO:1.6 && docker tag ghcr.io/bunkerity/$FROM-tests:1.6 ghcr.io/bunkerity/$TO:1.6 && docker push bunkerity/$TO:1.6 && docker push ghcr.io/bunkerity/$TO:1.6
+        run: docker pull ghcr.io/bunkerity/$FROM-tests:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 bunkerity/$TO:1.5 && docker tag ghcr.io/bunkerity/$FROM-tests:1.5 ghcr.io/bunkerity/$TO:1.5 && docker push bunkerity/$TO:1.5 && docker push ghcr.io/bunkerity/$TO:1.5
         env:
           FROM: "autoconf"
           TO: "bunkerweb-autoconf"
@@ -190,7 +190,7 @@ jobs:
         linux: [ubuntu, debian, fedora, el, el9, ubuntu-jammy]
         arch: [amd64]
         include:
-          - release: 1.6
+          - release: 1.5
             repo: bunkerweb
           - linux: ubuntu
             package_arch: amd64

.github/workflows/container-build.yml

@@ -49,8 +49,8 @@ jobs:
       - name: Replace VERSION
         if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev'
         run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh ${{ inputs.RELEASE }}
-      - name: Replace VERSION 1.6
-        if: inputs.RELEASE == '1.6'
+      - name: Replace VERSION 1.5
+        if: inputs.RELEASE == '1.5'
         run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh dev
       - name: Setup SSH for ARM node
         if: inputs.CACHE_SUFFIX == 'arm'

.github/workflows/linux-build.yml

@@ -41,8 +41,8 @@ jobs:
       - name: Replace VERSION
         if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui'
         run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh ${{ inputs.RELEASE }}
-      - name: Replace VERSION 1.6
-        if: inputs.RELEASE == '1.6'
+      - name: Replace VERSION 1.5
+        if: inputs.RELEASE == '1.5'
         run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh dev
       - name: Extract arch
         run: |
@@ -96,7 +96,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       # Build testing package image
       - name: Build package image
-        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.6'
+        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5'
         uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
         with:
           context: .
@@ -108,7 +108,7 @@ jobs:
           cache-to: type=gha,scope=${{ inputs.LINUX }}-${{ inputs.RELEASE }},mode=min
       # Build non-testing package image
       - name: Build package image
-        if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev' && inputs.RELEASE != 'ui' && inputs.RELEASE != '1.6'
+        if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev' && inputs.RELEASE != 'ui' && inputs.RELEASE != '1.5'
         uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
         with:
           context: .

.github/workflows/test-core-linux.yml

@@ -57,13 +57,13 @@ jobs:
       - name: Pull BW linux ubuntu test image
         run: docker pull ghcr.io/bunkerity/ubuntu-tests:${{ inputs.RELEASE }}
       - name: Copy deb file to host
-        if: inputs.RELEASE != '1.6'
+        if: inputs.RELEASE != '1.5'
         run: |
           container_id=$(docker create "ghcr.io/bunkerity/ubuntu-tests:${{ inputs.RELEASE }}")
           docker cp "$container_id:/opt/bunkerweb_${{ inputs.RELEASE }}-1_amd64.deb" "/tmp/bunkerweb.deb"
           docker rm "$container_id"
-      - name: Copy deb file to host 1.6
-        if: inputs.RELEASE == '1.6'
+      - name: Copy deb file to host 1.5
+        if: inputs.RELEASE == '1.5'
         run: |
           container_id=$(docker create "ghcr.io/bunkerity/ubuntu-tests:${{ inputs.RELEASE }}")
           docker cp "$container_id:/opt/bunkerweb_dev-1_amd64.deb" "/tmp/bunkerweb.deb"
@@ -78,7 +78,7 @@ jobs:
           sudo apt update
           sudo -E apt install -y nginx=1.26.1-2~noble
       - name: Fix version without a starting number
-        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == '1.6'
+        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == '1.5'
         run: echo "force-bad-version" | sudo tee -a /etc/dpkg/dpkg.cfg
       - name: Edit configuration files
         run: |

.github/workflows/tests-ui-linux.yml

@@ -57,13 +57,13 @@ jobs:
       - name: Pull BW linux ubuntu test image
         run: docker pull ghcr.io/bunkerity/ubuntu-tests:${{ inputs.RELEASE }}
       - name: Copy deb file to host
-        if: inputs.RELEASE != '1.6'
+        if: inputs.RELEASE != '1.5'
         run: |
           container_id=$(docker create "ghcr.io/bunkerity/ubuntu-tests:${{ inputs.RELEASE }}")
           docker cp "$container_id:/opt/bunkerweb_${{ inputs.RELEASE }}-1_amd64.deb" "/tmp/bunkerweb.deb"
           docker rm "$container_id"
-      - name: Copy deb file to host 1.6
-        if: inputs.RELEASE == '1.6'
+      - name: Copy deb file to host 1.5
+        if: inputs.RELEASE == '1.5'
         run: |
           container_id=$(docker create "ghcr.io/bunkerity/ubuntu-tests:${{ inputs.RELEASE }}")
           docker cp "$container_id:/opt/bunkerweb_dev-1_amd64.deb" "/tmp/bunkerweb.deb"
@@ -78,7 +78,7 @@ jobs:
           sudo apt update
           sudo -E apt install -y nginx=1.26.1-2~noble
       - name: Fix version without a starting number
-        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.6'
+        if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5'
         run: echo "force-bad-version" | sudo tee -a /etc/dpkg/dpkg.cfg
       - name: Edit configuration files
         run: |