From 6148a2b81098a04ea7d0107a400e356b5c1f58d1 Mon Sep 17 00:00:00 2001
From: "Niklas Sirch@XITASO" <niklas.sirch@xitaso.com>
Date: Tue, 10 Dec 2024 19:06:26 +0100
Subject: [PATCH] ci: cleanup

---
 .github/CODEOWNERS                     |  1 +
 .github/workflows/autoAddReviewer.yaml | 17 -----------------
 .github/workflows/docker-build.yml     | 11 ++++++++---
 3 files changed, 9 insertions(+), 20 deletions(-)
 create mode 100644 .github/CODEOWNERS
 delete mode 100644 .github/workflows/autoAddReviewer.yaml

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..e5cc847
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @GailMelanie @hofermo @JonathanXITASO @pawel-baran-se @XAlinaGS @Xmilofranke @NilsXitaso
\ No newline at end of file
diff --git a/.github/workflows/autoAddReviewer.yaml b/.github/workflows/autoAddReviewer.yaml
deleted file mode 100644
index fba26c8..0000000
--- a/.github/workflows/autoAddReviewer.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Auto Add Reviewer
-
-on:
-  pull_request:
-    types: [ opened ]
-
-jobs:
-  build:
-    permissions:
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add Reviewers
-        uses: madrapps/add-reviewers@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          reviewers: GailMelanie,hofermo,JonathanXITASO,pawel-baran-se,XAlinaGS,Xmilofranke,NilsXitaso
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index e46e7ea..84c4274 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -2,10 +2,14 @@ name: Docker
 
 on:
   push:
-    branches: ['**']
+    branches: ['main', 'dev', 'staging']
     tags: ['v*.*.*']
   pull_request:
-    branches: ['**']
+    branches: ['main', 'dev', 'staging']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # github.repository as <account>/<repo>
@@ -64,6 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # add more containers to run more tests in parallel
         containers: [1, 2, 3, 4]
 
     steps:
@@ -93,7 +98,6 @@ jobs:
 
       - name: E2E test collect artifact
         id: test_artifact
-        if: always()
         uses: actions/upload-artifact@v3
         with:
           name: cypress-artifacts-${{ matrix.containers }}
@@ -103,6 +107,7 @@ jobs:
     name: Push image to registry
     needs: ['build-browser-image', 'unit-tests', 'e2e-tests']
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/dev'
     permissions:
       contents: read
       packages: write