From 64df7763dcc8b978fe1c9da4a46660d0d26b43c1 Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Thu, 11 May 2023 12:22:40 -0400
Subject: [PATCH 1/5] workflows: update actions/checkout@v3

---
 .github/workflows/on-push.yml     | 4 +++-
 .github/workflows/on-tag-only.yml | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index cc4fbab3..ce52b93e 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -8,7 +8,9 @@ jobs:
         
         steps:
         
-        - uses: actions/checkout@v1
+        - uses: actions/checkout@v3
+          with:
+            fetch-depth: 0 ## all branches/tags
 
         - name: Run Apt-get update
           run: sudo apt-get update
diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml
index d1eb7cc1..76c79d19 100644
--- a/.github/workflows/on-tag-only.yml
+++ b/.github/workflows/on-tag-only.yml
@@ -12,8 +12,9 @@ jobs:
         
         steps:
         
-        - uses: actions/checkout@v1
-
+        - uses: actions/checkout@v3
+          with:
+            fetch-depth: 0 ## all branches/tags
         - name: Run Apt-get update
           run: sudo apt-get update
 

From 723c81ee6d5ff37a66696eae967a1d545219a5e0 Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Thu, 11 May 2023 12:30:52 -0400
Subject: [PATCH 2/5] workflows: fix indenting

---
 .github/workflows/on-push.yml     |  2 +-
 .github/workflows/on-tag-only.yml | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index ce52b93e..abf7bbea 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -38,7 +38,7 @@ jobs:
 
         - name: Set image name
           run: |
-              UMBREL_OS_VERSION="$(git describe --tags)"
+              UMBREL_OS_VERSION="$(git describe --tags || echo $(date +%s))"
               IMAGE_NAME="umbrel-os-${UMBREL_OS_VERSION}"
               echo "UMBREL_OS_VERSION=$UMBREL_OS_VERSION"  >> $GITHUB_ENV
               echo "IMAGE_NAME=$IMAGE_NAME"  >> $GITHUB_ENV
diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml
index 76c79d19..b104f3f4 100644
--- a/.github/workflows/on-tag-only.yml
+++ b/.github/workflows/on-tag-only.yml
@@ -23,33 +23,33 @@ jobs:
 
         - name: Nuke current Docker installation
           run: |
-                sudo systemctl stop docker
-                sudo apt-get purge docker-ce docker-ce-cli containerd.io moby-engine moby-cli
-                sudo rm -rf /var/lib/docker
+              sudo systemctl stop docker
+              sudo apt-get purge docker-ce docker-ce-cli containerd.io moby-engine moby-cli
+              sudo rm -rf /var/lib/docker
         
         - name: Re-install Docker
           run: |
-                curl -fsSL https://get.docker.com -o get-docker.sh
-                sudo sh get-docker.sh
-                docker --version
+              curl -fsSL https://get.docker.com -o get-docker.sh
+              sudo sh get-docker.sh
+              docker --version
 
         - name: Enable experimental features in Docker
           run: |
-                sudo rm -rf /etc/docker/daemon.json
-                echo '{"experimental": true}' | sudo tee -a /etc/docker/daemon.json
-                sudo systemctl restart docker
+              sudo rm -rf /etc/docker/daemon.json
+              echo '{"experimental": true}' | sudo tee -a /etc/docker/daemon.json
+              sudo systemctl restart docker
         
         - name: Set image name
           run: |
-                UMBREL_OS_VERSION="$(git describe --tags)"
-                IMAGE_NAME="umbrel-os-${UMBREL_OS_VERSION}"
-                echo "UMBREL_OS_VERSION=$UMBREL_OS_VERSION"  >> $GITHUB_ENV
-                echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
+              UMBREL_OS_VERSION="$(git describe --tags || echo $(date +%s))"
+              IMAGE_NAME="umbrel-os-${UMBREL_OS_VERSION}"
+              echo "UMBREL_OS_VERSION=$UMBREL_OS_VERSION"  >> $GITHUB_ENV
+              echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
 
         - name: Run build script
           run: |
-                echo "Building $IMAGE_NAME"
-                sudo IMG_FILENAME=$IMAGE_NAME ZIP_FILENAME=$IMAGE_NAME UMBREL_OS_VERSION=$UMBREL_OS_VERSION ./build.sh
+              echo "Building $IMAGE_NAME"
+              sudo IMG_FILENAME=$IMAGE_NAME ZIP_FILENAME=$IMAGE_NAME UMBREL_OS_VERSION=$UMBREL_OS_VERSION ./build.sh
 
         - name: Copy ZIP to current working dir
           run: cp deploy/*.zip ./

From 5c0c64391c38c7a5702ae3bdc008c0983e7b2f2d Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Thu, 11 May 2023 12:21:12 -0400
Subject: [PATCH 3/5] workflows: add concurrency detection

---
 .github/workflows/on-push.yml     | 4 ++++
 .github/workflows/on-tag-only.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index abf7bbea..de88158e 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -1,6 +1,10 @@
 name: Build image on push or PR
 on: ["push", "pull_request"]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
     build:
 
diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml
index b104f3f4..42e55936 100644
--- a/.github/workflows/on-tag-only.yml
+++ b/.github/workflows/on-tag-only.yml
@@ -5,6 +5,10 @@ on:
           - v[0-9]+.[0-9]+.[0-9]+
           - v[0-9]+.[0-9]+.[0-9]+-*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
     build:
 

From 299e7f0a8517d6f6f72e50b38105ab9e9bc0841a Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Thu, 11 May 2023 12:23:33 -0400
Subject: [PATCH 4/5] workflows: handle bdstar when not available

---
 .github/workflows/on-push.yml     | 5 ++++-
 .github/workflows/on-tag-only.yml | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index de88158e..a5b5fa10 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -20,7 +20,10 @@ jobs:
           run: sudo apt-get update
 
         - name: Install dependencies
-          run: sudo apt-get -y install quilt qemu-user-static debootstrap bsdtar
+          run: |
+              sudo apt-get --fix-missing -y install quilt qemu-user-static debootstrap
+              sudo apt-get --fix-missing -y install bsdtar || echo
+              sudo apt-get --fix-missing -y install libarchive-tools || echo
 
         - name: Nuke current Docker installation
           run: |
diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml
index 42e55936..d88600c5 100644
--- a/.github/workflows/on-tag-only.yml
+++ b/.github/workflows/on-tag-only.yml
@@ -23,7 +23,10 @@ jobs:
           run: sudo apt-get update
 
         - name: Install dependencies
-          run: sudo apt-get -y install quilt qemu-user-static debootstrap bsdtar
+          run: |
+              sudo apt-get --fix-missing -y install quilt qemu-user-static debootstrap
+              sudo apt-get --fix-missing -y install bsdtar || echo
+              sudo apt-get --fix-missing -y install libarchive-tools || echo
 
         - name: Nuke current Docker installation
           run: |

From 7d86bbfcec89686bff2ac88292bf2a18aee09dad Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Thu, 11 May 2023 12:26:14 -0400
Subject: [PATCH 5/5] workflows: use ubuntu-latest

---
 .github/workflows/on-push.yml     | 2 +-
 .github/workflows/on-tag-only.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index a5b5fa10..86ba4e4f 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -8,7 +8,7 @@ concurrency:
 jobs:
     build:
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         
         steps:
         
diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml
index d88600c5..0d1568d6 100644
--- a/.github/workflows/on-tag-only.yml
+++ b/.github/workflows/on-tag-only.yml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
     build:
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         
         steps: