Show github context

insightsengineering · Mar 7, 2024 · 0c8acc1 · 0c8acc1
1 parent 41a2f62
commit 0c8acc1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/.github/workflows/build-check-install.yaml b/.github/workflows/build-check-install.yaml
@@ -231,30 +231,30 @@ jobs:
           ref: ${{ steps.branch-name.outputs.head_ref_branch }}
           path: ${{ github.event.repository.name }}
 
-      # - name: Check commit message 💬
-      #   run: |
-      #     git config --global --add safe.directory $(pwd)
-      #     export head_commit_message="$(git show -s --format=%B | tr '\r\n' ' ' | tr '\n' ' ')"
-      #     echo "head_commit_message = $head_commit_message"
-      #     if [[ $head_commit_message == *"$SKIP_INSTRUCTION"* ]]; then
-      #       echo "Skip instruction detected - cancelling the workflow."
-      #       curl -s -LJ -o gh.tar.gz https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_amd64.tar.gz
-      #       tar -xzf gh.tar.gz --strip-components 2
-      #       ./gh version
-      #       ./gh run cancel ${{ github.run_id }}
-      #       ./gh run watch ${{ github.run_id }}
-      #     fi
-      #   shell: bash
-      #   env:
-      #     GH_TOKEN: ${{ steps.github-token.outputs.token }}
-      #     GH_CLI_VERSION: 2.44.1
-      #     SKIP_INSTRUCTION: "[skip r-cmd]"
-
       - name: Check commit message 💬
-        uses: ./r.pkg.template/.github/workflows/check-commit-message
-        with:
-          gh-token: ${{ steps.github-token.outputs.token }}
-          skip-instruction: "[skip r-cmd]"
+        run: |
+          git config --global --add safe.directory $(pwd)
+          export head_commit_message="$(git show -s --format=%B | tr '\r\n' ' ' | tr '\n' ' ')"
+          echo "head_commit_message = $head_commit_message"
+          if [[ $head_commit_message == *"$SKIP_INSTRUCTION"* ]]; then
+            echo "Skip instruction detected - cancelling the workflow."
+            curl -s -LJ -o gh.tar.gz https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_amd64.tar.gz
+            tar -xzf gh.tar.gz --strip-components 2
+            ./gh version
+            ./gh run cancel ${{ github.run_id }}
+            ./gh run watch ${{ github.run_id }}
+          fi
+        shell: bash
+        env:
+          GH_TOKEN: ${{ steps.github-token.outputs.token }}
+          GH_CLI_VERSION: 2.44.1
+          SKIP_INSTRUCTION: "[skip r-cmd]"
+
+      # - name: Check commit message 💬
+      #   uses: ./r.pkg.template/.github/workflows/check-commit-message
+      #   with:
+      #     github-token: ${{ steps.github-token.outputs.token }}
+      #     skip-instruction: "[skip r-cmd]"
 
       - name: Checkout gh-pages 🛎
         if: >-

diff --git a/.github/workflows/roxygen.yaml b/.github/workflows/roxygen.yaml
@@ -93,6 +93,11 @@ jobs:
           ref: ${{ steps.branch-name.outputs.head_ref_branch }}
           path: ${{ github.event.repository.name }}
 
+      - name: Show github context
+        run: |
+          echo "head commit message = ${{ toJSON(github.event.head_commit.message) }}"
+          echo "github context = ${{ toJSON(github) }}
+
       - name: Check commit message 💬
         run: |
           git config --global --add safe.directory $(pwd)
@@ -107,6 +112,7 @@ jobs:
             ./gh run watch ${{ github.run_id }}
           fi
         shell: bash
+        working-directory: ${{ github.event.repository.name }}
         env:
           GH_TOKEN: ${{ steps.github-token.outputs.token }}
           GH_CLI_VERSION: 2.44.1

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -364,6 +364,7 @@ jobs:
             ./gh run watch ${{ github.run_id }}
           fi
         shell: bash
+        working-directory: ${{ github.event.repository.name }}
         env:
           GH_TOKEN: ${{ steps.github-token.outputs.token }}
           GH_CLI_VERSION: 2.44.1