From a9319142f3dfbbb4e851d0c2edaf97041623f548 Mon Sep 17 00:00:00 2001
From: Simone Basso <bassosimone@gmail.com>
Date: Fri, 22 Oct 2021 16:13:44 +0200
Subject: [PATCH] feat: only publish pkgs when we're in staging branches (#556)

See https://github.com/ooni/probe/issues/1506#issuecomment-949664779
---
 .github/workflows/android.yml   | 1 +
 .github/workflows/ios.yml       | 1 +
 .github/workflows/jafar.yml     | 1 +
 .github/workflows/linux.yml     | 9 ++++++---
 .github/workflows/miniooni.yml  | 1 +
 .github/workflows/oohelperd.yml | 4 +++-
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5dcc224..e105468 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -3,6 +3,7 @@ name: android
 on:
   push:
     branches:
+      - "mobile-staging"
       - "release/**"
 jobs:
   test:
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 1b0fca8..60136a9 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -3,6 +3,7 @@ name: ios
 on:
   push:
     branches:
+      - "mobile-staging"
       - "release/**"
 jobs:
   test:
diff --git a/.github/workflows/jafar.yml b/.github/workflows/jafar.yml
index d76177c..901d542 100644
--- a/.github/workflows/jafar.yml
+++ b/.github/workflows/jafar.yml
@@ -1,3 +1,4 @@
+# jafar checks whether the jafar tool is still WAI.
 name: jafar
 on:
   push:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 36f2490..35f76e7 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,11 +1,10 @@
-# linux builds ooniprobe for Linux
+# linux builds and publishes ooniprobe for Linux
 name: linux
 on:
   push:
     branches:
       - "release/**"
-      - "stable"
-      - "linux"
+      - "ooniprobe-staging"
 
 jobs:
   build_386:
@@ -15,6 +14,7 @@ jobs:
       - run: ./mk OONI_PSIPHON_TAGS="" DEBIAN_TILDE_VERSION=$GITHUB_RUN_NUMBER ./debian/386
       - run: ./E2E/ooniprobe.sh ./CLI/linux/386/ooniprobe
       - run: ./CLI/linux/pubdebian
+        if: github.ref == 'refs/heads/ooniprobe-staging'
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -27,6 +27,7 @@ jobs:
       - run: ./mk OONI_PSIPHON_TAGS="" DEBIAN_TILDE_VERSION=$GITHUB_RUN_NUMBER ./debian/amd64
       - run: ./E2E/ooniprobe.sh ./CLI/linux/amd64/ooniprobe
       - run: ./CLI/linux/pubdebian
+        if: github.ref == 'refs/heads/ooniprobe-staging'
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -41,6 +42,7 @@ jobs:
       - run: ./mk OONI_PSIPHON_TAGS="" DEBIAN_TILDE_VERSION=$GITHUB_RUN_NUMBER ./debian/arm
       - run: ./E2E/ooniprobe.sh ./CLI/linux/arm/ooniprobe
       - run: ./CLI/linux/pubdebian
+        if: github.ref == 'refs/heads/ooniprobe-staging'
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -55,6 +57,7 @@ jobs:
       - run: ./mk OONI_PSIPHON_TAGS="" DEBIAN_TILDE_VERSION=$GITHUB_RUN_NUMBER ./debian/arm64
       - run: ./E2E/ooniprobe.sh ./CLI/linux/arm64/ooniprobe
       - run: ./CLI/linux/pubdebian
+        if: github.ref == 'refs/heads/ooniprobe-staging'
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/miniooni.yml b/.github/workflows/miniooni.yml
index d0ce736..6e34650 100644
--- a/.github/workflows/miniooni.yml
+++ b/.github/workflows/miniooni.yml
@@ -5,6 +5,7 @@ name: miniooni
 on:
   push:
     branches:
+      - "master"
       - "release/**"
 jobs:
   test:
diff --git a/.github/workflows/oohelperd.yml b/.github/workflows/oohelperd.yml
index 595eb22..9ea1271 100644
--- a/.github/workflows/oohelperd.yml
+++ b/.github/workflows/oohelperd.yml
@@ -1,9 +1,10 @@
-# oohelperd builds oohelperd for Linux
+# oohelperd builds and publishes oohelperd for Linux
 name: oohelperd
 on:
   push:
     branches:
       - "release/**"
+      - "oohelperd-staging"
 
 jobs:
   build_amd64:
@@ -31,6 +32,7 @@ jobs:
           dpkg-buildpackage -us -uc -b
 
       - name: upload package
+        if: github.ref == 'refs/heads/oohelperd-staging'
         run: |
           curl -fsSLO https://raw.githubusercontent.com/ooni/sysadmin/master/tools/debops-ci
           chmod +x debops-ci