Upd: Simplify GitHub actions

bokysan · Apr 13, 2022 · 5bcaa63 · 5bcaa63
1 parent 81eb4ea
commit 5bcaa63
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 64 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -5,25 +5,25 @@ on:
     branches: [ 'master' ]
 
 jobs:
-  "Unit Tests":
+  Unit_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/unit-tests
-  "Integration Tests":
+  Integration_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/integration-tests
-  "Helm chart Tests":
+  Helm_chart_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/helm-chart-tests
 
-  "Build Alpine":
+  Build_Alpine:
     runs-on: ubuntu-latest
     needs:
-      - "Unit Tests"
-      - "Integration Tests"
-      - "Helm chart Tests"
+      - Unit_Tests
+      - Integration_Tests
+      - Helm_chart_Tests
     steps:
       # Checkout
       - name: Checkout
@@ -68,12 +68,12 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  "Build Ubuntu":
+  Build_Ubuntu:
     runs-on: ubuntu-latest
     needs:
-      - "Unit Tests"
-      - "Integration Tests"
-      - "Helm chart Tests"
+      - Unit_Tests
+      - Integration_Tests
+      - Helm_chart_Tests
     steps:
       # Checkout
       - name: Checkout

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -5,53 +5,30 @@ on:
     branches: [ 'master' ]
 
 jobs:
-  "Unit Tests":
+  Unit_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/unit-tests
-  "Integration Tests":
+  Integration_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/integration-tests
-  "Helm chart Tests":
+  Helm_chart_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/helm-chart-tests
 
-  "Build Alpine":
+  Build_Alpine:
     runs-on: ubuntu-latest
     needs:
-      - "Unit Tests"
-      - "Integration Tests"
-      - "Helm chart Tests"
+      - Unit_Tests
+      - Integration_Tests
+      - Helm_chart_Tests
     steps:
+      # Checkout
+      # Buildkit setup
       - uses: ./.github/actions/buildx-setup
 
-
-
-
-
-
-
-
-
-
-      - name: Get release version
-        id: version_number
-        shell: bash
-        run: |
-          echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
-          echo "::set-output name=RELEASE_VERSION::${GITHUB_REF:10}"
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@master
-        with:
-          install: true
-
       - name: Cache Docker layers
         uses: actions/cache@v3
         with:
@@ -61,12 +38,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
 
-
-
-
-
-
-
       - name: Fix issue with building Alpine # See https://gitlab.alpinelinux.org/alpine/aports/-/issues/12406
         run: |
           update-binfmts --enable

diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml
@@ -5,25 +5,25 @@ on:
     tags: [ 'v*.*.*' ]
 
 jobs:
-  "Unit Tests":
+  Unit_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/unit-tests
-  "Integration Tests":
+  Integration_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/integration-tests
-  "Helm chart Tests":
+  Helm_chart_Tests:
     runs-on: ubuntu-latest
     steps:
       - uses: ./.github/actions/helm-chart-tests
 
-  "Build Alpine":
+  Build_Alpine:
     runs-on: ubuntu-latest
     needs:
-      - "Unit Tests"
-      - "Integration Tests"
-      - "Helm chart Tests"
+      - Unit_Tests
+      - Integration_Tests
+      - Helm_chart_Tests
     steps:
       # Checkout
       - name: Checkout
@@ -70,12 +70,12 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  "Build Ubuntu":
+  Build_Ubuntu:
     runs-on: ubuntu-latest
     needs:
-      - "Unit Tests"
-      - "Integration Tests"
-      - "Helm chart Tests"
+      - Unit_Tests
+      - Integration_Tests
+      - Helm_chart_Tests
     steps:
       # Checkout
       - name: Checkout
@@ -115,12 +115,12 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  "Build Helm chart":
+  Release:
     runs-on: ubuntu-latest
     needs:
-      - "Unit Tests"
-      - "Integration Tests"
-      - "Helm chart Tests"
+      - Unit_Tests
+      - Integration_Tests
+      - Helm_chart_Tests
 
     steps:
       # Checkout