From e48aa048a2d517d4fedc8ec1fe46260f7e4c3994 Mon Sep 17 00:00:00 2001
From: Dongsu Park <dongsu@kinvolk.io>
Date: Wed, 13 May 2020 12:07:24 +0200
Subject: [PATCH] .github: check out with a specific channel name

When checking out into a branch name, append `-${CHANNEL}` to the name,
so the branch can be distinguished from each other. To do that, make
every Github actions yaml file pass in its corresponding `CHANNEL`
variable.
---
 .../coreos-overlay/.github/workflows/containerd-apply-patch.sh  | 2 +-
 .../.github/workflows/containerd-releases-alpha.yml             | 1 +
 .../.github/workflows/containerd-releases-edge.yml              | 1 +
 .../coreos-overlay/.github/workflows/docker-apply-patch.sh      | 2 +-
 .../coreos-overlay/.github/workflows/docker-releases-alpha.yml  | 1 +
 .../coreos-overlay/.github/workflows/docker-releases-edge.yml   | 1 +
 .../coreos-overlay/.github/workflows/go-apply-patch.sh          | 2 +-
 .../coreos-overlay/.github/workflows/go-releases-alpha.yml      | 1 +
 .../coreos-overlay/.github/workflows/go-releases-edge.yml       | 1 +
 .../coreos-overlay/.github/workflows/kernel-apply-patch.sh      | 2 +-
 .../coreos-overlay/.github/workflows/kernel-releases-alpha.yml  | 1 +
 .../coreos-overlay/.github/workflows/kernel-releases-beta.yml   | 1 +
 .../coreos-overlay/.github/workflows/kernel-releases-edge.yml   | 1 +
 .../coreos-overlay/.github/workflows/kernel-releases-stable.yml | 1 +
 .../coreos-overlay/.github/workflows/runc-apply-patch.sh        | 2 +-
 .../coreos-overlay/.github/workflows/runc-releases-alpha.yml    | 1 +
 .../coreos-overlay/.github/workflows/runc-releases-edge.yml     | 1 +
 .../coreos-overlay/.github/workflows/rust-apply-patch.sh        | 2 +-
 .../coreos-overlay/.github/workflows/rust-release-alpha.yml     | 1 +
 .../coreos-overlay/.github/workflows/rust-release-edge.yml      | 1 +
 20 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh
index 959ea01ed9..4843a1b0f9 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 . .github/workflows/common.sh
 
-checkout_branches "containerd-${VERSION_NEW}"
+checkout_branches "containerd-${VERSION_NEW}-${CHANNEL}"
 
 pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
 
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-alpha.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-alpha.yml
index 552b395099..9bf8d2d57c 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-alpha.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Alpha
         id: apply-patch-alpha
         env:
+          CHANNEL: alpha
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
           COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_ALPHA }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-edge.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-edge.yml
index 1f0ae26ad3..212cbf41d2 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-edge.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-edge.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Edge
         id: apply-patch-edge
         env:
+          CHANNEL: edge
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
           COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_EDGE }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh
index 2b6293f78c..1d0a7d2c96 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 . .github/workflows/common.sh
 
-checkout_branches "docker-${VERSION_NEW}"
+checkout_branches "docker-${VERSION_NEW}-${CHANNEL}"
 
 pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
 
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-alpha.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-alpha.yml
index 69319df256..660ee0163b 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-alpha.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Alpha
         id: apply-patch-alpha
         env:
+          CHANNEL: alpha
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
           COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_ALPHA }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-edge.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-edge.yml
index 61f5f886dc..ddd371fc4c 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-edge.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-edge.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Edge
         id: apply-patch-edge
         env:
+          CHANNEL: edge
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
           COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_EDGE }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
index 260f3be396..7fb5a9fe84 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
@@ -7,7 +7,7 @@ VERSION_SHORT=${VERSION_NEW%.*}
 
 . .github/workflows/common.sh
 
-checkout_branches "go-${VERSION_NEW}"
+checkout_branches "go-${VERSION_NEW}-${CHANNEL}"
 
 pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
 
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml
index c959e5b39e..35988ad786 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Alpha
         id: apply-patch-alpha
         env:
+          CHANNEL: alpha
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-edge.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-edge.yml
index d1e158abae..4911e5ccf6 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-edge.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-edge.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Edge
         id: apply-patch-edge
         env:
+          CHANNEL: edge
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
index ba72e53184..9414b99158 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
@@ -7,7 +7,7 @@ VERSION_SHORT=${VERSION_NEW%.*}
 
 . .github/workflows/common.sh
 
-checkout_branches "linux-${VERSION_NEW}"
+checkout_branches "linux-${VERSION_NEW}-${CHANNEL}"
 
 pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
 
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml
index ee8cc77625..c8465586fe 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Alpha
         id: apply-patch-alpha
         env:
+          CHANNEL: alpha
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml
index c72ce7c611..06405ab41d 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Beta
         id: apply-patch-beta
         env:
+          CHANNEL: beta
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_BETA }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_BETA }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-edge.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-edge.yml
index 49ea363442..1c40534932 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-edge.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-edge.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Edge
         id: apply-patch-edge
         env:
+          CHANNEL: edge
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml
index 0adc9ad24f..282a3cb1d2 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Apply patch for Stable
         id: apply-patch-stable
         env:
+          CHANNEL: stable
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_STABLE }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_STABLE }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh
index 9c50bd4762..869cab4342 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 . .github/workflows/common.sh
 
-checkout_branches "runc-${VERSION_NEW}"
+checkout_branches "runc-${VERSION_NEW}-${CHANNEL}"
 
 pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
 
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-alpha.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-alpha.yml
index ee133cd0ee..9b3f086c16 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-alpha.yml
@@ -27,6 +27,7 @@ jobs:
       - name: Apply patch for Alpha
         id: apply-patch-alpha
         env:
+          CHANNEL: alpha
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-edge.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-edge.yml
index 9a069482dc..f27af03c1f 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-edge.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-edge.yml
@@ -27,6 +27,7 @@ jobs:
       - name: Apply patch for Edge
         id: apply-patch-edge
         env:
+          CHANNEL: edge
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh
index 7ed611b78a..e8e2a6c25e 100755
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 . .github/workflows/common.sh
 
-checkout_branches "rust-${VERSION_NEW}"
+checkout_branches "rust-${VERSION_NEW}-${CHANNEL}"
 
 pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit
 
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-alpha.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-alpha.yml
index 86f223056b..40ec4adeb2 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-alpha.yml
@@ -24,6 +24,7 @@ jobs:
       - name: Apply patch for Alpha
         id: apply-patch-alpha
         env:
+          CHANNEL: alpha
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-edge.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-edge.yml
index fc79842549..ae86d4c962 100644
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-edge.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-edge.yml
@@ -24,6 +24,7 @@ jobs:
       - name: Apply patch for Edge
         id: apply-patch-edge
         env:
+          CHANNEL: edge
           BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
           PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
           VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}