[GHA] Add `v1.11` branch target

diff --git a/.github/docker/debian/trixie/amd64/public.release.Dockerfile b/.github/docker/debian/trixie/amd64/public.release.Dockerfile
index 13a57440acf2c59d7912c6d3f9037dd312b63086..0dd30afa46ed923d92fd7e38a48848ccb2e88297 100644 (file)
--- a/.github/docker/debian/trixie/amd64/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/amd64/public.release.Dockerfile
@@ -55,7 +55,7 @@ RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     sha512sum /run/secrets/REPO_PASSWORD && \
     curl -sSL https://freeswitch.org/fsget | \
-        bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
+        bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
     apt-get --quiet update && \
     mk-build-deps \
         --install \

diff --git a/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile b/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
index c96c491ffa4911028db3f8d7336c2dada59185a5..ac55ff917240178160cc0496fbec0f2a71e1e5de 100644 (file)
--- a/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
@@ -55,7 +55,7 @@ RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     sha512sum /run/secrets/REPO_PASSWORD && \
     curl -sSL https://freeswitch.org/fsget | \
-        bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
+        bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
     apt-get --quiet update && \
     mk-build-deps \
         --install \

diff --git a/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile b/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
index ef0ad6a7e9cf89260ec89bdde5e2c466f546a7fc..0856169b6f88d223750f6d72a7cb5e27b0be1d13 100644 (file)
--- a/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
@@ -55,7 +55,7 @@ RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     sha512sum /run/secrets/REPO_PASSWORD && \
     curl -sSL https://freeswitch.org/fsget | \
-        bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
+        bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
     apt-get --quiet update && \
     mk-build-deps \
         --install \

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46cb2e47f25140cc1f8f2e419d097f30fa8e67f4..6cd13d8322114c567d9d9a21ad50e334a6aadb46 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - v1.10
+      - v1.11
     paths:
       - "**"
   workflow_dispatch:
@@ -68,14 +69,14 @@ jobs:
         id: release
         run: |
           if [[ '${{ github.event_name }}' == 'pull_request' ]]; then
-            if [[ '${{ github.base_ref }}' == 'v1.10' ]]; then
+            if [[ '${{ github.base_ref }}' == 'v1.10' || '${{ github.base_ref }}' == 'v1.11' ]]; then
               echo 'release=release' | tee -a $GITHUB_OUTPUT
             else
               echo 'release=unstable' | tee -a $GITHUB_OUTPUT
             fi
           elif [[ '${{ github.event_name }}' == 'workflow_dispatch' ]]; then
             echo 'release=${{ inputs.release }}' | tee -a $GITHUB_OUTPUT
-          elif [[ '${{ github.ref }}' == 'refs/heads/v1.10' ]]; then
+          elif [[ '${{ github.ref }}' == 'refs/heads/v1.10' || '${{ github.ref }}' == 'refs/heads/v1.11' ]]; then
             echo 'release=release' | tee -a $GITHUB_OUTPUT
           else
             echo 'release=unstable' | tee -a $GITHUB_OUTPUT
@@ -157,7 +158,7 @@ jobs:
           (
             github.event_name == 'push' &&
             github.repository == 'signalwire/freeswitch' &&
-            contains(fromJSON('["master", "v1.10"]'), github.ref_name)
+            contains(fromJSON('["master", "v1.10", "v1.11"]'), github.ref_name)
           ) ||
           (github.event_name == 'workflow_dispatch' && inputs.publish)
         }}
@@ -192,7 +193,7 @@ jobs:
       ${{
         github.event_name == 'push' &&
         github.repository == 'signalwire/freeswitch' &&
-        contains(fromJSON('["master", "v1.10"]'), github.ref_name)
+        contains(fromJSON('["master", "v1.10", "v1.11"]'), github.ref_name)
       }}
     needs:
       - deb-public

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a774108e0a05893135a6da63fc4c4f74ffd0762..0d65a6171a3e0fdba5b7bdd60cd3de6d828159f0 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - v1.10
+      - v1.11
   pull_request:
     types:
       - opened

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5dd889689b2f53002005029e31adc6ba7df06549..24546bfbb3da7623bd8b9ac359551c4941768e88 100644 (file)
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -6,10 +6,12 @@ on:
     branches:
       - master
       - v1.10
+      - v1.11
   pull_request:
     branches:
       - master
       - v1.10
+      - v1.11
 
 jobs:
   build:

diff --git a/.github/workflows/scan-build.yml b/.github/workflows/scan-build.yml
index a5b77a5dce3436be8128d6b6ce7f0beaae033723..5617f3a6888d46bee02344eaa1c14e66399e9eab 100644 (file)
--- a/.github/workflows/scan-build.yml
+++ b/.github/workflows/scan-build.yml
@@ -91,7 +91,7 @@ jobs:
         if: |
           failure() &&
           github.event_name == 'push' &&
-          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10')
+          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10' || github.ref == 'refs/heads/v1.11')
         uses: signalwire/actions-template/.github/actions/slack@main
         with:
           CHANNEL: ${{ secrets.SLACK_DEVOPS_CI_CHANNEL }}

diff --git a/.github/workflows/unit-test-dind.yml b/.github/workflows/unit-test-dind.yml
index ca3abd5a6f683c699f2998df7121c4709e8dc817..082763c07e7f04231b17c94bb838144f5752c3d9 100644 (file)
--- a/.github/workflows/unit-test-dind.yml
+++ b/.github/workflows/unit-test-dind.yml
@@ -91,7 +91,7 @@ jobs:
         if: |
           failure() &&
           github.event_name == 'push' &&
-          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10')
+          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10' || github.ref == 'refs/heads/v1.11')
         uses: signalwire/actions-template/.github/actions/slack@main
         with:
           CHANNEL: ${{ secrets.SLACK_DEVOPS_CI_CHANNEL }}

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 6a9e15bfd999a805311f35574c026e6230d8f195..32c1b2c580d136682a43c305d8d23ff2e696a560 100644 (file)
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -128,7 +128,7 @@ jobs:
         if: |
           failure() &&
           github.event_name == 'push' &&
-          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10')
+          (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10' || github.ref == 'refs/heads/v1.11')
         uses: signalwire/actions-template/.github/actions/slack@main
         with:
           CHANNEL: ${{ secrets.SLACK_DEVOPS_CI_CHANNEL }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f11b45ab7912ab9d496785a834bd5bce4ad15a05..fb1a98770a3fd6849b7157007f9ae104e89dc36a 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -40,4 +40,4 @@ jobs:
       with:
         name: MSI Package
         path: D:\a\freeswitch\freeswitch\x64\*.msi
-      if: contains(github.event.pull_request.title, ':upload-artifacts') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10'
+      if: contains(github.event.pull_request.title, ':upload-artifacts') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v1.10' || github.ref == 'refs/heads/v1.11'