Merge branch 'main' into update-modules-to-update-with-config

Author: Eslam-Nawara

.github/workflows/bin-package-18.04.yaml

@@ -55,7 +55,7 @@ jobs:
           name: ${{ steps.package.outputs.name }}.flist
       - name: Tagging
         uses: threefoldtech/publish-flist@master
-        if: success() && (github.ref == 'refs/heads/main' ||  github.ref == 'refs/heads/fix-zos-urls' || startsWith(github.ref, 'refs/tags/v'))
+        if: success() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ||  github.ref == 'refs/heads/testdeploy' )
         with:
           token: ${{ secrets.token }}
           action: tag

.github/workflows/bin-package.yaml

@@ -56,7 +56,7 @@ jobs:
           ./bins-extra.sh --package ${{ inputs.package }}
 
       - name: Publish flist (tf-autobuilder, ${{ steps.package.outputs.name }})
-        if: success() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/fix-zos-urls' || startsWith(github.ref, 'refs/tags/v'))
+        if: success() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/testdeploy' || startsWith(github.ref, 'refs/tags/v'))
         uses: threefoldtech/publish-flist@master
         with:
           token: ${{ secrets.token }}
@@ -69,7 +69,7 @@ jobs:
 
       - name: Tagging
         uses: threefoldtech/publish-flist@master
-        if: success() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/fix-zos-urls' || startsWith(github.ref, 'refs/tags/v'))
+        if: success() && (github.ref == 'refs/heads/main'  || github.ref == 'refs/heads/testdeploy'|| startsWith(github.ref, 'refs/tags/v'))
         with:
           token: ${{ secrets.token }}
           action: tag

.github/workflows/publish.yaml

@@ -73,7 +73,7 @@ jobs:
       # will use the tag value (has to start with v)
       - name: Tagging
         uses: threefoldtech/publish-flist@master
-        if: success() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/fix-zos-urls' || startsWith(github.ref, 'refs/tags/v'))
+        if: success() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')|| github.ref == 'refs/heads/testdeploy')
         with:
           token: ${{ secrets.HUB_JWT }}
           action: tag
@@ -86,7 +86,7 @@ jobs:
       # only for main branch (devnet)
       # this basically releases this build to devnet
       - name: Cross tagging (development)
-        if: success() && (github.ref == 'refs/heads/main'|| github.ref == 'refs/heads/fix-zos-urls')
+        if: success() &&  (github.ref == 'refs/heads/main'|| github.ref == 'refs/heads/testdeploy')
         uses: threefoldtech/publish-flist@master
         with:
           token: ${{ secrets.HUB_JWT }}