Merge pull request #15 from chessbyte/github_actions_4

Fixed bundle install and refactored commit message

Author: Fryguy

.github/workflows/deploy.yaml

@@ -9,7 +9,7 @@ jobs:
       JEKYLL_ENV: production
       MIQ_ENV: production
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      PAYLOAD_REF: ${{ github.event.client_payload.ref }}
+      PAYLOAD_REF_NAME: ${{ github.event.client_payload.ref_name }}
       PAYLOAD_SHA: ${{ github.event.client_payload.sha }}
       PAYLOAD_REPOSITORY: ${{ github.event.client_payload.repository }}
       PAYLOAD_PR_NUMBER: ${{ github.event.client_payload.pr_number }}
@@ -23,8 +23,9 @@ jobs:
       - name: Get manageiq.org repo
         run: git clone https://github.com/ManageIQ/manageiq.org
       - name: Build
-        run: cd manageiq.org && exe/miq build all
-      - name: Set COMMIT_MESSAGE
-        run: create_commit_message.rb >> $GITHUB_ENV
+        run: |
+          cd manageiq.org
+          bundle install
+          exe/miq build all
       - name: Deploy
         run: deploy.sh

create_commit_message.rb

@@ -12,5 +12,19 @@ git config --global user.email "[email protected]"
 git clone --bare --branch master --depth 5 https://x-access-token:${GITHUB_TOKEN}@github.com/ManageIQ/manageiq.github.io .git
 git config core.bare false
 git add -A
-git commit -m "${COMMIT_MESSAGE}"
+
+commit_message=$(
+ruby << RUBY
+  message =
+    if ENV["PAYLOAD_PR_NUMBER"].to_s =~ /^(\d+)$/
+      "#{ENV["PAYLOAD_REPOSITORY"]}##{\$1}"
+    else
+      "#{ENV["PAYLOAD_REPOSITORY"]}@#{ENV["PAYLOAD_SHA"]} (#{ENV["PAYLOAD_REF_NAME"]})"
+    end
+
+  puts message
+RUBY
+)
+
+git commit -m "Deploy for ${commit_message}"
 git push origin master