From 45f4e06acee90a53d9be53224347eef136d22f8b Mon Sep 17 00:00:00 2001
From: bunkerity <contact@bunkerity.com>
Date: Tue, 23 Aug 2022 09:32:07 +0200
Subject: [PATCH] road to v1.4.3

---
 .github/workflows/dev.yml | 128 +++++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 6fff7d030..31b6a87aa 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -103,60 +103,60 @@ jobs:
           cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min
 
   # Build bunkerweb/arm
-  # build-bw-arm:
-    # runs-on: ubuntu-latest
-    # steps:
-      # Prepare
-      # - name: Checkout source code
-        # uses: actions/checkout@v3
-      # - name: Setup Buildx
-        # id: buildx
-        # uses: docker/setup-buildx-action@v2
-      # - name: Login to Docker Hub
-        # uses: docker/login-action@v2
-        # with:
-          # username: ${{ secrets.DOCKER_USERNAME }}
-          # password: ${{ secrets.DOCKER_TOKEN }}
-      # - name: Setup SSH for ARM node
-        # run: |
-          # mkdir -p ~/.ssh
-          # echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
-          # chmod 600 ~/.ssh/id_rsa_arm
-          # echo "$SSH_CONFIG" > ~/.ssh/config
-        # env:
-          # SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
-          # SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
-      # - name: Append ARM node to buildx
-        # run: |
-          # docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+  build-bw-arm:
+    runs-on: ubuntu-latest
+    steps:
+      Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
 
-      # Build images
-      # - name: Build BW for ARM
-        # uses: docker/build-push-action@v3
-        # with:
-          # context: .
-          # platforms: linux/arm64,linux/arm/v7
-          # tags: bunkerweb-tests-arm:latest
-          # cache-from: type=registry,ref=bunkerity/cache:bw-arm-cache
-          # cache-to: type=registry,ref=bunkerity/cache:bw-arm-cache,mode=min
-      # - name: Build BW autoconf for ARM
-        # uses: docker/build-push-action@v3
-        # with:
-          # context: .
-          # file: autoconf/Dockerfile
-          # platforms: linux/arm64,linux/arm/v7
-          # tags: bunkerweb-autoconf-tests-arm:latest
-          # cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache
-          # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache,mode=min
-      # - name: Build BW UI for ARM
-        # uses: docker/build-push-action@v3
-        # with:
-          # context: .
-          # file: ui/Dockerfile
-          # platforms: linux/arm64,linux/arm/v7
-          # tags: bunkerweb-ui-tests-arm:latest
-          # cache-from: type=registry,ref=bunkerity/cache:bw-ui-arm-cache
-          # cache-to: type=registry,ref=bunkerity/cache:bw-ui-arm-cache,mode=min
+      Build images
+      - name: Build BW for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-arm-cache,mode=min
+      - name: Build BW autoconf for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-autoconf-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache,mode=min
+      - name: Build BW UI for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-ui-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-ui-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-arm-cache,mode=min
 
   # Build linux ubuntu
   build-bw-ubuntu:
@@ -374,18 +374,18 @@ jobs:
         run: cat /opt/.runner_env >> $GITHUB_ENV
 
       # Run tests
-      # - name: Run Docker tests
-        # run: ./tests/main.py "docker"
-      # - name: Run Autoconf tests
-        # run: ./tests/main.py "autoconf"
-      # - name: Run Swarm tests
-        # run: ./tests/main.py "swarm"
-      # - name: Run Kubernetes tests
-        # run: ./tests/main.py "kubernetes"
+      - name: Run Docker tests
+        run: ./tests/main.py "docker"
+      - name: Run Autoconf tests
+        run: ./tests/main.py "autoconf"
+      - name: Run Swarm tests
+        run: ./tests/main.py "swarm"
+      - name: Run Kubernetes tests
+        run: ./tests/main.py "kubernetes"
       - name: Generate Linux packages and build test images
         run: ./tests/linux.sh ${{ env.BUILD_MODE }}
-      # - name: Run Linux Ubuntu tests
-        # run: ./tests/main.py "linux" "ubuntu"
+      - name: Run Linux Ubuntu tests
+        run: ./tests/main.py "linux" "ubuntu"
       - name: Run Linux Debian tests
         run: ./tests/main.py "linux" "debian"
       - name: Run Linux CentOS tests
@@ -405,7 +405,7 @@ jobs:
 
   # Push to dev registries
   push-docker:
-    needs: [tests, build-bw-386] #, build-bw-arm]
+    needs: [tests, build-bw-386, build-bw-arm]
     runs-on: ubuntu-latest
     steps: