Extract shim-logs to external repository and move it to bins-extra

.github/workflows/bins-extra-development.yaml

@@ -207,3 +207,41 @@ jobs:
         user: tf-zos-bins.dev
         name: logtrunc.flist
         target: tf-autobuilder/${{ steps.package.outputs.name }}.flist
+
+  shim-logs:
+    name: 'Package: shim-logs'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v1
+
+    - name: Setup basesystem
+      run: |
+        cd bins
+        sudo ./bins-extra.sh --package basesystem
+
+    - name: Build package
+      id: package
+      run: |
+        cd bins
+        sudo ./bins-extra.sh --package shimlogs
+
+    - name: Publish flist (tf-autobuilder, ${{ steps.package.outputs.name }})
+      if: success()
+      uses: threefoldtech/publish-flist@master
+      with:
+        token: ${{ secrets.HUB_JWT }}
+        action: publish
+        user: tf-autobuilder
+        root: bins/releases/shimlogs
+        name: ${{ steps.package.outputs.name }}.flist
+
+    - name: Crosslink flist (tf-zos-bins.dev)
+      if: success() && github.ref == 'refs/heads/master'
+      uses: threefoldtech/publish-flist@master
+      with:
+        token: ${{ secrets.HUB_JWT }}
+        action: crosslink
+        user: tf-zos-bins.dev
+        name: shim-logs.flist
+        target: tf-autobuilder/${{ steps.package.outputs.name }}.flist

.github/workflows/bins-extra-pre-release.yaml

@@ -212,3 +212,41 @@ jobs:
         user: tf-zos-bins.test
         name: logtrunc.flist
         target: tf-autobuilder/${{ steps.package.outputs.name }}.flist
+
+  shim-logs:
+    name: 'Package: shim-logs'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v1
+
+    - name: Setup basesystem
+      run: |
+        cd bins
+        sudo ./bins-extra.sh --package basesystem
+
+    - name: Build package
+      id: package
+      run: |
+        cd bins
+        sudo ./bins-extra.sh --package shimlogs
+
+    - name: Publish flist (tf-autobuilder, ${{ steps.package.outputs.name }})
+      if: success()
+      uses: threefoldtech/publish-flist@master
+      with:
+        token: ${{ secrets.HUB_JWT }}
+        action: publish
+        user: tf-autobuilder
+        root: bins/releases/shimlogs
+        name: ${{ steps.package.outputs.name }}.flist
+
+    - name: crosslink flist (tf-zos-bins.test)
+      if: success()
+      uses: threefoldtech/publish-flist@master
+      with:
+        token: ${{ secrets.hub_jwt }}
+        action: crosslink
+        user: tf-zos-bins.test
+        name: shim-logs.flist
+        target: tf-autobuilder/${{ steps.package.outputs.name }}.flist

.github/workflows/bins-extra-release.yaml

@@ -215,3 +215,41 @@ jobs:
         name: logtrunc.flist
         target: tf-autobuilder/${{ steps.package.outputs.name }}.flist
 
+  shim-logs:
+    name: 'Package: shim-logs'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v1
+
+    - name: Setup basesystem
+      run: |
+        cd bins
+        sudo ./bins-extra.sh --package basesystem
+
+    - name: Build package
+      id: package
+      run: |
+        cd bins
+        sudo ./bins-extra.sh --package shimlogs
+
+    - name: Publish flist (tf-autobuilder, ${{ steps.package.outputs.name }})
+      if: success()
+      uses: threefoldtech/publish-flist@master
+      with:
+        token: ${{ secrets.HUB_JWT }}
+        action: publish
+        user: tf-autobuilder
+        root: bins/releases/shimlogs
+        name: ${{ steps.package.outputs.name }}.flist
+
+    - name: crosslink flist (tf-zos-bins)
+      if: success()
+      uses: threefoldtech/publish-flist@master
+      with:
+        token: ${{ secrets.hub_jwt }}
+        action: crosslink
+        user: tf-zos-bins
+        name: shim-logs.flist
+        target: tf-autobuilder/${{ steps.package.outputs.name }}.flist
+

.github/workflows/publish-development.yaml

@@ -18,11 +18,6 @@ jobs:
         go-version: 1.14
       id: go
 
-    - name: Prepare dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libjansson-dev libhiredis-dev
-
     - name: Checkout code into the Go module directory
       uses: actions/checkout@v1
 

.github/workflows/publish-pre-release.yaml

@@ -25,11 +25,6 @@ jobs:
         go-version: 1.14
       id: go
 
-    - name: Prepare dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libjansson-dev libhiredis-dev
-
     - name: Checkout code into the Go module directory
       uses: actions/checkout@v1
 

.github/workflows/publish-release.yaml

@@ -26,11 +26,6 @@ jobs:
         go-version: 1.14
       id: go
 
-    - name: Prepare dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libjansson-dev libhiredis-dev
-
     - name: Checkout code into the Go module directory
       uses: actions/checkout@v1
 

bins/packages/shimlogs/shimlogs.sh

@@ -0,0 +1,52 @@
+SHIMLOGS_VERSION="0.1"
+SHIMLOGS_CHECKSUM="f97c7067064d0cd1643c8141d982c293"
+SHIMLOGS_LINK="https://github.com/threefoldtech/shim-logs/archive/v${SHIMLOGS_VERSION}.tar.gz"
+
+dependencies_shimlogs() {
+    apt-get install -y libjansson-dev libhiredis-dev build-essential
+}
+
+download_shimlogs() {
+    download_file ${SHIMLOGS_LINK} ${SHIMLOGS_CHECKSUM} shim-logs-${SHIMLOGS_VERSION}.tar.gz
+}
+
+extract_shimlogs() {
+    tar -xf ${DISTDIR}/shim-logs-${SHIMLOGS_VERSION}.tar.gz -C ${WORKDIR}
+}
+
+prepare_shimlogs() {
+    echo "[+] prepare shim-logs"
+    github_name "shim-logs-${SHIMLOGS_VERSION}"
+}
+
+compile_shimlogs() {
+    echo "[+] compile shim-logs"
+    make
+}
+
+install_shimlogs() {
+    echo "[+] install shim-logs"
+
+    mkdir -p "${ROOTDIR}/bin"
+
+    cp shim-logs ${ROOTDIR}/bin/shim-logs
+    chmod +x ${ROOTDIR}/bin/shim-logs
+}
+
+build_shimlogs() {
+    pushd "${DISTDIR}"
+
+    dependencies_shimlogs
+    download_shimlogs
+    extract_shimlogs
+
+    popd
+    pushd ${WORKDIR}/shim-logs-${SHIMLOGS_VERSION}
+
+    prepare_shimlogs
+    compile_shimlogs
+    install_shimlogs
+
+    popd
+}
+

cmds/Makefile

@@ -5,13 +5,9 @@ dirty = $(shell test -n "`git diff --shortstat 2> /dev/null | tail -n1`" && echo
 version = github.com/threefoldtech/zos/pkg/version
 ldflags = '-w -s -X $(version).Branch=$(branch) -X $(version).Revision=$(revision) -X $(version).Dirty=$(dirty)'
 
-all: $(shell ls -d */) logs
+all: $(shell ls -d */)
 	strip $(OUT)/*
 
-logs:
-	$(MAKE) -C shim-logs
-	cp shim-logs/shim-logs $(OUT)/
-
 .PHONY: output clean
 
 output: