From fe5edd58593c2b9ce314470c54acc2ddaac8e66d Mon Sep 17 00:00:00 2001
From: Divyanshu Agrawal <diagrawa@redhat.com>
Date: Mon, 13 Sep 2021 19:51:29 +0530
Subject: [PATCH] Add matrix to install latest buildah (#67)

* Add matrix to install latest buildah

Signed-off-by: divyansh42 <diagrawa@redhat.com>
---
 .github/install_latest_buildah.sh      |  7 +++++++
 .github/workflows/dockerfile_build.yml | 10 ++++++++++
 .github/workflows/multiarch.yml        |  7 +++++++
 .github/workflows/scratch_build.yml    | 10 ++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 .github/install_latest_buildah.sh

diff --git a/.github/install_latest_buildah.sh b/.github/install_latest_buildah.sh
new file mode 100644
index 0000000..83b2ecf
--- /dev/null
+++ b/.github/install_latest_buildah.sh
@@ -0,0 +1,7 @@
+# https://github.com/containers/buildah/blob/main/install.md
+. /etc/os-release
+sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${ID^}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
+wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${ID^}_${VERSION_ID}/Release.key -O Release.key
+sudo apt-key add - < Release.key
+sudo apt-get update -qq
+sudo apt-get -qq -y install buildah
diff --git a/.github/workflows/dockerfile_build.yml b/.github/workflows/dockerfile_build.yml
index 8d353b6..1cdbfbe 100644
--- a/.github/workflows/dockerfile_build.yml
+++ b/.github/workflows/dockerfile_build.yml
@@ -16,6 +16,11 @@ jobs:
   build:
     name: Build image using Buildah
     runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        install_latest: [ true, false ]
+
     steps:
 
       # Checkout buildah action github repository
@@ -24,6 +29,11 @@ jobs:
         with:
           path: "buildah-build"
 
+      - name: Install latest buildah
+        if: matrix.install_latest
+        run: |
+          bash buildah-build/.github/install_latest_buildah.sh
+
       - name: Create Dockerfile
         run: |
           cat > Dockerfile<<EOF
diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
index a92cbf4..b431b8b 100644
--- a/.github/workflows/multiarch.yml
+++ b/.github/workflows/multiarch.yml
@@ -18,6 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         arch: [ amd64, i386, arm64v8 ]
+        install_latest: [ true, false ]
+
     steps:
 
       # Checkout buildah action github repository
@@ -26,6 +28,11 @@ jobs:
         with:
           path: "buildah-build"
 
+      - name: Install latest buildah
+        if: matrix.install_latest
+        run: |
+          bash buildah-build/.github/install_latest_buildah.sh
+
       - name: Install qemu dependency
         run: |
           sudo apt-get update
diff --git a/.github/workflows/scratch_build.yml b/.github/workflows/scratch_build.yml
index d91c24f..e6caecc 100644
--- a/.github/workflows/scratch_build.yml
+++ b/.github/workflows/scratch_build.yml
@@ -18,6 +18,11 @@ jobs:
   build:
     name: Build image using Buildah
     runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        install_latest: [ true, false ]
+
     steps:
 
       # Checkout buildah action github repository
@@ -26,6 +31,11 @@ jobs:
         with:
           path: "buildah-build"
 
+      - name: Install latest buildah
+        if: matrix.install_latest
+        run: |
+          bash buildah-build/.github/install_latest_buildah.sh
+
       # Checkout spring-petclinic github repository
       - name: Checkout spring-petclinic project
         uses: actions/checkout@v2