Combine the test and docker workflows (#4)

* Combine the test and docker workflows * Fixed the dependency name in the cicd workflow
idgenchev · Apr 10, 2021 · cfda474 · cfda474
1 parent 05f7db0
commit cfda474
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 65 deletions.
diff --git a/.github/workflows/docker.yaml → .github/workflows/cicd.yaml b/.github/workflows/docker.yaml → .github/workflows/cicd.yaml
@@ -1,27 +1,47 @@
-name: Build and push docker images
+name: CI/CD
 
 on:
   push:
     branches:
       - 'main'
     tags:
       - 'v*.*.*'
-      - 'v*.*'
-
-  workflow_run:
-    workflows:
-      - 'Test'
+  pull_request:
     branches:
       - 'main'
-    tags:
-      - 'v*.*.*'
-      - 'v*.*'
-    types:
-      - completed
 
 jobs:
-  docker:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+
+  lint-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+
+      - name: Install dependencies
+        run: go get -u golang.org/x/lint/golint
+
+      - name: Lint
+        run: golint -set_exit_status ./...
+
+      - name: Check gofmt
+        run: ./scripts/gofmt-check.sh
+
+      - name: Vet
+        run: go vet ./...
+
+      - name: Test
+        run: go test -v ./...
+
+  build-and-push-docker-images:
+    needs: lint-and-test
+    if: ${{ github.event_name != 'pull_request' }}
 
     runs-on: ubuntu-latest
 
@@ -38,12 +58,8 @@ jobs:
           flavor: |
             latest=true
           tags: |
-            type=schedule
             type=ref,event=branch
-            type=ref,event=pr
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
 
       - name: Docker meta for the init container
         id: initmeta
@@ -54,12 +70,8 @@ jobs:
           flavor: |
             latest=true
           tags: |
-            type=schedule
             type=ref,event=branch
-            type=ref,event=pr
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -68,7 +80,6 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-![Tests](https://github.com/idgenchev/namespace-node-affinity/actions/workflows/test.yaml/badge.svg?branch=main)
-![Build and push docker images](https://github.com/idgenchev/namespace-node-affinity/actions/workflows/docker.yaml/badge.svg?branch=main)
+![CI/CD](https://github.com/idgenchev/namespace-node-affinity/actions/workflows/cicd.yaml/badge.svg?branch=main)
 [![Go Report Card](https://goreportcard.com/badge/github.com/idgenchev/namespace-node-affinity)](https://goreportcard.com/report/github.com/idgenchev/namespace-node-affinity)
 
 # Namespace Node Affinity