From 023c60dede221b7175bb3e5a683c80bc9016c943 Mon Sep 17 00:00:00 2001
From: "Salvador E. Tropea" <salvador@inti.gob.ar>
Date: Sun, 5 Dec 2021 10:17:02 -0300
Subject: [PATCH] Moved nightly to a separated dir and added a workflow for it.

---
 .github/workflows/docker_hub.yml              |  9 ++---
 .github/workflows/docker_hub_nightly.yml      | 35 +++++++++++++++++++
 Makefile                                      |  4 +--
 Dockerfile-nightly => nightly/Dockerfile      |  0
 .../run_kicad_same_user_ng.sh                 |  0
 .../run_shell_same_user_ng.sh                 |  0
 6 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/docker_hub_nightly.yml
 rename Dockerfile-nightly => nightly/Dockerfile (100%)
 rename run_kicad_same_user_ng.sh => nightly/run_kicad_same_user_ng.sh (100%)
 rename run_shell_same_user_ng.sh => nightly/run_shell_same_user_ng.sh (100%)

diff --git a/.github/workflows/docker_hub.yml b/.github/workflows/docker_hub.yml
index 16ffcd5..6c79e05 100644
--- a/.github/workflows/docker_hub.yml
+++ b/.github/workflows/docker_hub.yml
@@ -1,12 +1,9 @@
-name: Docker Hub upload
+name: Docker Hub upload (normal)
 
 on:
   push:
-    tags-ignore:
-      - "v1"
-      - "v2"
-      - "v3"
-      - "v4"
+    tags:
+      - b*
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/docker_hub_nightly.yml b/.github/workflows/docker_hub_nightly.yml
new file mode 100644
index 0000000..faadf4c
--- /dev/null
+++ b/.github/workflows/docker_hub_nightly.yml
@@ -0,0 +1,35 @@
+name: Docker Hub upload (nightly)
+
+on:
+  push:
+    tags:
+      - n*
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v2
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      with:
+        images: setsoft/kicad_auto
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+      with:
+        context: nightly
+        push: true
+        tags: setsoft/kicad_auto:nightly
+        labels: ${{ steps.meta.outputs.labels }}
diff --git a/Makefile b/Makefile
index 8a52b45..247579c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@ build_rc:
 	docker build -f Dockerfile -t $(docker_img):$(tagname_rc) .
 
 build_ng:
-	docker build -f Dockerfile-nightly -t $(docker_img):$(tagname_ng) .
-	docker build -f Dockerfile-nightly -t $(docker_img):nightly .
+	docker build -f nightly/Dockerfile -t $(docker_img):$(tagname_ng) .
+	docker build -f nightly/Dockerfile -t $(docker_img):nightly .
 
 upload_image:
 	#docker login --username=$(docker_user)
diff --git a/Dockerfile-nightly b/nightly/Dockerfile
similarity index 100%
rename from Dockerfile-nightly
rename to nightly/Dockerfile
diff --git a/run_kicad_same_user_ng.sh b/nightly/run_kicad_same_user_ng.sh
similarity index 100%
rename from run_kicad_same_user_ng.sh
rename to nightly/run_kicad_same_user_ng.sh
diff --git a/run_shell_same_user_ng.sh b/nightly/run_shell_same_user_ng.sh
similarity index 100%
rename from run_shell_same_user_ng.sh
rename to nightly/run_shell_same_user_ng.sh