Fix version

Author: ciarams87

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - test-ci
+      - main
     paths-ignore:
       - 'docs/**'
       - 'examples/**'
@@ -46,7 +46,7 @@ jobs:
         run: |
           echo "::set-output name=sha::$(echo ${GITHUB_SHA} | cut -c1-7)"
           echo "::set-output name=repo::$(echo ${GITHUB_REPOSITORY} | cut -d '/' -f 2)"
-          echo "::set-output name=version::${GITHUB_REF/refs\/tags\//}"
+          echo "::set-output name=version::$(echo ${GITHUB_REF} | cut -d '/' -f 2)"
 
   build:
     name: Build Image
@@ -60,16 +60,16 @@ jobs:
       - name: DockerHub Login
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.TEST_DOCKER_USERNAME }}
-          password: ${{ secrets.TEST_DOCKER_PASSWORD }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: github.event_name != 'pull_request'
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
         if: github.event_name != 'pull_request'
-      # - name: Login to GitHub Container Registry
-      #   uses: docker/login-action@v1
-      #   with:
-      #     registry: ghcr.io
-      #     username: ${{ github.repository_owner }}
-      #     password: ${{ secrets.GITHUB_TOKEN }}
-      #   if: github.event_name != 'pull_request'
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v1
         with:
@@ -82,7 +82,8 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            ciarasf5/nginx-ingress-operator
+            nginx/nginx-ingress-operator
+            ghcr.io/nginxinc/nginx-ingress-operator
           tags: |
             type=edge
             type=ref,event=pr
@@ -115,15 +116,15 @@ jobs:
           build-args: |
             VERSION=${{ steps.var.outputs.version }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/[email protected].3
+        uses: aquasecurity/[email protected].5
         continue-on-error: true
         with:
           image-ref: nginx/nginx-ingress-operator:${{ steps.meta.outputs.version }}
           format: 'sarif'
           output: 'trivy-results.sarif'
           ignore-unfixed: 'true'
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         continue-on-error: true
         with:
           sarif_file: 'trivy-results.sarif'
@@ -144,7 +145,7 @@ jobs:
     steps:
       - name: Workflow Status
         id: check
-        uses: martialonline/workflow-status@v2
+        uses: martialonline/workflow-status@v3
       - name: Send Notification
         uses: 8398a7/action-slack@v3
         if: steps.check.outputs.status == 'failure'