Merge pull request #60 from ONSdigital/ras-1737-fix-dependabot-workflow

fix dependabot workflow

Author: anwilkie

.github/workflows/main.yml

@@ -5,8 +5,6 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-  workflow_dispatch:
-    branches: [ main ]
 
 env:
   IMAGE: print-file
@@ -32,35 +30,37 @@ jobs:
         run: |
           make test
       - name: Authenticate with Google Cloud
-        if: github.event.pull_request.user.login != 'dependabot[bot]'
+        if: github.actor != 'dependabot[bot]'
         id: auth
         uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
         with:
           credentials_json: ${{ secrets.GCR_KEY }}
       - name: Setup Google Cloud SDK
-        if: github.event.pull_request.user.login != 'dependabot[bot]'
+        if: github.actor != 'dependabot[bot]'
         uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
-      - run: |
+      - name: Configure Docker for Artifact Registry
+        if: github.actor != 'dependabot[bot]'
+        run: |
           gcloud auth configure-docker
           gcloud auth configure-docker "$REGISTRY_HOSTNAME"
       - name: pr docker tag
-        if: github.ref != 'refs/heads/main' && github.event.pull_request.user.login != 'dependabot[bot]'
+        if: github.ref != 'refs/heads/main' && github.actor != 'dependabot[bot]'
         id: tag
         run: |
           PR=$(echo "$GITHUB_REF" | awk -F / '{print $3}')
           echo "$PR"
           echo "pr_number=pr-$PR" >> $GITHUB_ENV
       # Build the Docker image
       - name: Build Docker Image
-        if: github.ref != 'refs/heads/main' && github.event.pull_request.user.login != 'dependabot[bot]'
+        if: github.ref != 'refs/heads/main' && github.actor != 'dependabot[bot]'
         run: |
           docker build -f _infra/docker/Dockerfile -t "$REGISTRY_HOSTNAME"/"$GAR_GOOGLE_PROJECT_ID"/"$GAR_REPOSITORY"/"$IMAGE":${{ env.pr_number }} .
       - name: Push dev image
-        if: github.ref != 'refs/heads/main' && github.event.pull_request.user.login != 'dependabot[bot]'
+        if: github.ref != 'refs/heads/main' && github.actor != 'dependabot[bot]'
         run: |
           docker push "$REGISTRY_HOSTNAME"/"$GAR_GOOGLE_PROJECT_ID"/"$GAR_REPOSITORY"/"$IMAGE":${{ env.pr_number }}
       - name: template helm
-        if: github.event.pull_request.user.login != 'dependabot[bot]'
+        if: github.actor != 'dependabot[bot]'
         run: |
           helm template $CHART_DIRECTORY
       - name: Set current tag
@@ -148,14 +148,14 @@ jobs:
           echo "version=$(grep -E "appVersion:\s+" $CHART_DIRECTORY/Chart.yaml | cut -d" " -f2 | sed -r 's/"//g')" >> $GITHUB_ENV
 
       - name: package helm
-        if: github.event.pull_request.user.login != 'dependabot[bot]'
+        if: github.actor != 'dependabot[bot]'
         run: |
           echo HELM_VERSION=$(grep -E "version:\s+" $CHART_DIRECTORY/Chart.yaml | cut -d" " -f2 | sed -r 's/"//g') >> $GITHUB_ENV
           helm dep up $CHART_DIRECTORY
           helm package $CHART_DIRECTORY
 
       - name: Publish dev Chart
-        if: github.ref != 'refs/heads/main' && github.event.pull_request.user.login != 'dependabot[bot]'
+        if: github.ref != 'refs/heads/main' && github.actor != 'dependabot[bot]'
         run: |
           mv $IMAGE-${{ env.HELM_VERSION }}.tgz $IMAGE-${{ env.pr_number }}.tgz
           gsutil cp $IMAGE-*.tgz gs://$ARTIFACT_BUCKET/$IMAGE/

_infra/helm/print-file/Chart.yaml

@@ -4,6 +4,6 @@ description: A Helm chart for deploying the rasrm print file generator
 
 type: application
 
-version: 1.0.47
+version: 1.0.48
 
-appVersion: 1.0.47
+appVersion: 1.0.48