Fix promxy-operator build

k0rdent · Jan 22, 2025 · b67becc · b67becc
1 parent cfe30d1
commit b67becc
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 26 deletions.
diff --git a/.github/workflows/release.yml → .github/workflows/release_charts.yml b/.github/workflows/release.yml → .github/workflows/release_charts.yml
@@ -44,4 +44,5 @@ jobs:
         uses: helm/[email protected]
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          CR_SKIP_EXISTING: true
+          CR_SKIP_EXISTING: true
+
diff --git a/.github/workflows/build.yml → .github/workflows/release_operator.yml b/.github/workflows/build.yml → .github/workflows/release_operator.yml
@@ -1,20 +1,10 @@
-name: promxy-operator-build
+name: promxy-operator-release
 on:
-  pull_request_target:
-    types:
-      - labeled
-      - opened
-      - synchronize
-      - reopened
-    branches:
-      - main
-      - release-*
-    paths:
-      - "promxy-operator/**"
-      - "!**.md"
   push:
     tags:
       - "*"
+    branches:
+      - main
 
 env:
   GO_VERSION: "1.22"
@@ -28,24 +18,12 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.vars.outputs.version }}
-      pr: ${{ steps.pr.outputs.result }}
     permissions:
       packages: write
     steps:
-      - name: Get PR ref
-        uses: actions/github-script@v7
-        id: pr
-        with:
-          script: |
-            const { data: pullRequest } = await github.rest.pulls.get({
-              ...context.repo,
-              pull_number: context.payload.pull_request.number,
-            });
-            return pullRequest
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: ${{fromJSON(steps.pr.outputs.result).merge_commit_sha}}
           fetch-depth: 0
       - name: Setup Go
         uses: actions/setup-go@v5

diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml
@@ -0,0 +1,55 @@
+name: promxy-operator-build
+on:
+  pull_request_target:
+    types:
+      - labeled
+      - opened
+      - synchronize
+      - reopened
+    branches:
+      - main
+      - release-*
+    paths:
+      - "promxy-operator/**"
+      - "!**.md"
+
+env:
+  GO_VERSION: "1.22"
+
+jobs:
+  build:
+    concurrency:
+      group: build-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
+    name: Build and Unit Test
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.vars.outputs.version }}
+      pr: ${{ steps.pr.outputs.result }}
+    permissions:
+      packages: write
+    steps:
+      - name: Get PR ref
+        uses: actions/github-script@v7
+        id: pr
+        with:
+          script: |
+            const { data: pullRequest } = await github.rest.pulls.get({
+              ...context.repo,
+              pull_number: context.payload.pull_request.number,
+            });
+            return pullRequest
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{fromJSON(steps.pr.outputs.result).merge_commit_sha}}
+          fetch-depth: 0
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          cache: false
+      - name: Unit tests
+        working-directory: ./promxy-operator
+        run: |
+          make test