ci: need curl installed before we can do the GH cli install on debian

.github/workflows/gen_debian10.3.yml

@@ -22,6 +22,15 @@ jobs:
       - name: "set APT to non-interactive"
         shell: bash
         run: "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections"
+      - name: "Update APT"
+        shell: bash
+        run: "apt update"
+      - name: "Install git"
+        shell: bash
+        run: "apt-get install -y git"
+      - name: "Install curl"
+        shell: bash
+        run: "apt-get install -y curl"
       - name: "Install GitHub keyring"
         shell: bash
         run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
@@ -34,12 +43,6 @@ jobs:
       - name: "Install GH CLI"
         shell: bash
         run: " apt install gh"
-      - name: "Install git"
-        shell: bash
-        run: "apt-get install -y git"
-      - name: "Install curl"
-        shell: bash
-        run: "apt-get install -y curl"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"

.github/workflows/gen_debian10.3_continuous.yml

@@ -26,6 +26,21 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+      - name: "Update APT"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          apt update
+      - name: "Install git"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          apt-get install -y git
+      - name: "Install curl"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          apt-get install -y curl
       - name: "Install GitHub keyring"
         shell: bash
         run: |
@@ -46,16 +61,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
            apt install gh
-      - name: "Install git"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt-get install -y git
-      - name: "Install curl"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt-get install -y curl
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: |

.github/workflows/gen_debian10.3_tag.yml

@@ -13,6 +13,15 @@ jobs:
       - name: "set APT to non-interactive"
         shell: bash
         run: "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections"
+      - name: "Update APT"
+        shell: bash
+        run: "apt update"
+      - name: "Install git"
+        shell: bash
+        run: "apt-get install -y git"
+      - name: "Install curl"
+        shell: bash
+        run: "apt-get install -y curl"
       - name: "Install GitHub keyring"
         shell: bash
         run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
@@ -25,12 +34,6 @@ jobs:
       - name: "Install GH CLI"
         shell: bash
         run: " apt install gh"
-      - name: "Install git"
-        shell: bash
-        run: "apt-get install -y git"
-      - name: "Install curl"
-        shell: bash
-        run: "apt-get install -y curl"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"

.github/workflows/gen_debian11.yml

@@ -22,6 +22,15 @@ jobs:
       - name: "set APT to non-interactive"
         shell: bash
         run: "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections"
+      - name: "Update APT"
+        shell: bash
+        run: "apt update"
+      - name: "Install git"
+        shell: bash
+        run: "apt-get install -y git"
+      - name: "Install curl"
+        shell: bash
+        run: "apt-get install -y curl"
       - name: "Install GitHub keyring"
         shell: bash
         run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
@@ -34,12 +43,6 @@ jobs:
       - name: "Install GH CLI"
         shell: bash
         run: " apt install gh"
-      - name: "Install git"
-        shell: bash
-        run: "apt-get install -y git"
-      - name: "Install curl"
-        shell: bash
-        run: "apt-get install -y curl"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"

.github/workflows/gen_debian11_continuous.yml

@@ -26,6 +26,21 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+      - name: "Update APT"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          apt update
+      - name: "Install git"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          apt-get install -y git
+      - name: "Install curl"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          apt-get install -y curl
       - name: "Install GitHub keyring"
         shell: bash
         run: |
@@ -46,16 +61,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
            apt install gh
-      - name: "Install git"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt-get install -y git
-      - name: "Install curl"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt-get install -y curl
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: |

.github/workflows/gen_debian11_tag.yml

@@ -13,6 +13,15 @@ jobs:
       - name: "set APT to non-interactive"
         shell: bash
         run: "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections"
+      - name: "Update APT"
+        shell: bash
+        run: "apt update"
+      - name: "Install git"
+        shell: bash
+        run: "apt-get install -y git"
+      - name: "Install curl"
+        shell: bash
+        run: "apt-get install -y curl"
       - name: "Install GitHub keyring"
         shell: bash
         run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
@@ -25,12 +34,6 @@ jobs:
       - name: "Install GH CLI"
         shell: bash
         run: " apt install gh"
-      - name: "Install git"
-        shell: bash
-        run: "apt-get install -y git"
-      - name: "Install curl"
-        shell: bash
-        run: "apt-get install -y curl"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"

.github/workflows/gen_debian9.12.yml

@@ -22,18 +22,9 @@ jobs:
       - name: "set APT to non-interactive"
         shell: bash
         run: "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\" | {sudo} tee /etc/apt/sources.list.d/github-cli.list > /dev/null"
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: " apt install gh"
       - name: "Cache Git installation"
         uses: actions/cache@v2.1.7
         with:
@@ -54,6 +45,18 @@ jobs:
       - name: "Install curl"
         shell: bash
         run: "apt-get install -y curl"
+      - name: "Install GitHub keyring"
+        shell: bash
+        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
+      - name: "Add GitHub package list"
+        shell: bash
+        run: "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\" | {sudo} tee /etc/apt/sources.list.d/github-cli.list > /dev/null"
+      - name: "Update APT"
+        shell: bash
+        run: "apt update"
+      - name: "Install GH CLI"
+        shell: bash
+        run: " apt install gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"

.github/workflows/gen_debian9.12_continuous.yml

@@ -26,26 +26,11 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-      - name: "Add GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\" | {sudo} tee /etc/apt/sources.list.d/github-cli.list > /dev/null
       - name: "Update APT"
         shell: bash
         run: |
           export BUILD_REASON=Schedule
           apt update
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-           apt install gh
       - name: "Cache Git installation"
         uses: actions/cache@v2.1.7
         with:
@@ -69,6 +54,26 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           apt-get install -y curl
+      - name: "Install GitHub keyring"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+      - name: "Add GitHub package list"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\" | {sudo} tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+      - name: "Update APT"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+          apt update
+      - name: "Install GH CLI"
+        shell: bash
+        run: |
+          export BUILD_REASON=Schedule
+           apt install gh
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: |

.github/workflows/gen_debian9.12_tag.yml

@@ -13,18 +13,9 @@ jobs:
       - name: "set APT to non-interactive"
         shell: bash
         run: "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\" | {sudo} tee /etc/apt/sources.list.d/github-cli.list > /dev/null"
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: " apt install gh"
       - name: "Cache Git installation"
         uses: actions/cache@v2.1.7
         with:
@@ -45,6 +36,18 @@ jobs:
       - name: "Install curl"
         shell: bash
         run: "apt-get install -y curl"
+      - name: "Install GitHub keyring"
+        shell: bash
+        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg |  dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
+      - name: "Add GitHub package list"
+        shell: bash
+        run: "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\" | {sudo} tee /etc/apt/sources.list.d/github-cli.list > /dev/null"
+      - name: "Update APT"
+        shell: bash
+        run: "apt update"
+      - name: "Install GH CLI"
+        shell: bash
+        run: " apt install gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"

ci/generate-workflows.py

@@ -484,28 +484,18 @@ cargo build --all --release""",
 
     def prep_environment(self, cache=True):
         steps = []
+        sudo = "sudo -n " if self.needs_sudo() else ""
         if self.uses_apt():
-            sudo = "sudo -n " if self.needs_sudo() else ""
             if self.container:
                 steps += [
                     RunStep(
                         "set APT to non-interactive",
                         "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections",
                     ),
-                    RunStep(
-                        "Install GitHub keyring",
-                        f"curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | {sudo} dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg",
-                    ),
-                    RunStep(
-                        "Add GitHub package list",
-                        'echo \\"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\\" | {sudo} tee /etc/apt/sources.list.d/github-cli.list > /dev/null',
-                    ),
                 ]
             steps += [
                 RunStep("Update APT", f"{sudo}apt update"),
             ]
-            if self.container:
-                steps += [RunStep("Install GH CLI", f"{sudo} apt install gh")]
 
         if self.container:
             if ("fedora" in self.container) or ("centos" in self.container):
@@ -530,6 +520,22 @@ cargo build --all --release""",
         steps += self.install_newer_compiler()
         steps += self.install_git()
         steps += self.install_curl()
+
+        if self.uses_apt():
+            if self.container:
+                steps += [
+                    RunStep(
+                        "Install GitHub keyring",
+                        f"curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | {sudo} dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg",
+                    ),
+                    RunStep(
+                        "Add GitHub package list",
+                        'echo \\"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\\" | {sudo} tee /etc/apt/sources.list.d/github-cli.list > /dev/null',
+                    ),
+                    RunStep("Update APT", f"{sudo}apt update"),
+                    RunStep("Install GH CLI", f"{sudo} apt install gh"),
+                ]
+
         steps += self.install_openssh_server()
         steps += [
             CheckoutStep(),