Clean up PreGate check (#642)

microsoft · Aug 3, 2023 · d411e62 · d411e62
1 parent adaf03e
commit d411e62
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 47 deletions.
diff --git a/Actions/VerifyPRChanges/README.md b/Actions/VerifyPRChanges/README.md
@@ -3,10 +3,6 @@ Verify PR Changes for AL-Go workflows
 ## Parameters
 ### token (default github.token)
 The GitHub token running the action
-### baseSHA (default github.event.pull_request.base.sha)
-Base commit of the PR
-### headSHA (default github.event.pull_request.head.sha)
-Head commit of the PR
 ### prBaseRepository (default github.event.pull_request.base.repo.full_name)
 The name of the repository the PR is going to
 ### pullRequestId (default github.event.pull_request.number)

diff --git a/Actions/VerifyPRChanges/VerifyPRChanges.ps1 b/Actions/VerifyPRChanges/VerifyPRChanges.ps1
@@ -1,10 +1,6 @@
 Param(
   [Parameter(HelpMessage = "The token to use for the GitHub API", Mandatory = $false)]
   [string] $token,
-  [Parameter(HelpMessage = "Base commit of the PR", Mandatory = $false)]
-  [string] $baseSHA,
-  [Parameter(HelpMessage = "Head commit of the PR", Mandatory = $false)]
-  [string] $headSHA,
   [Parameter(HelpMessage = "The name of the repository the PR is going to", Mandatory = $false)]
   [string] $prBaseRepository,
   [Parameter(HelpMessage = "The id of the pull request", Mandatory = $false)]

diff --git a/Actions/VerifyPRChanges/action.yaml b/Actions/VerifyPRChanges/action.yaml
@@ -9,14 +9,6 @@ inputs:
     description: The token to use for the GitHub API
     required: false
     default: ${{ github.token }}
-  baseSHA:
-    description: Base commit of the PR
-    required: false
-    default: ${{ github.event.pull_request.base.sha }}
-  headSHA:
-    description: Head commit of the PR
-    required: false
-    default: ${{ github.event.pull_request.head.sha }}
   prBaseRepository:
     description: The name of the repository the PR is going to
     required: false
@@ -32,11 +24,9 @@ runs:
       shell: ${{ inputs.shell }}
       env:
         _token: ${{ inputs.token }}
-        _baseSHA: ${{ inputs.baseSHA }}
-        _headSHA: ${{ inputs.headSHA }}
         _prBaseRepository: ${{ inputs.prBaseRepository }}
         _pullRequestId: ${{ inputs.pullRequestId }}
-      run: try { ${{ github.action_path }}/VerifyPRChanges.ps1 -token $ENV:_token -baseSHA $ENV:_baseSHA -headSHA $ENV:_headSHA -prBaseRepository $ENV:_prBaseRepository -pullRequestId $ENV:_pullRequestId } catch { Write-Host "::Error::Unexpected error when running action ($($_.Exception.Message.Replace("*",'').Replace("*",' ')))"; exit 1 }
+      run: try { ${{ github.action_path }}/VerifyPRChanges.ps1 -token $ENV:_token -prBaseRepository $ENV:_prBaseRepository -pullRequestId $ENV:_pullRequestId } catch { Write-Host "::Error::Unexpected error when running action ($($_.Exception.Message.Replace("*",'').Replace("*",' ')))"; exit 1 }
 branding:
   icon: terminal
   color: blue
diff --git a/Templates/AppSource App/.github/workflows/PullRequestHandler.yaml b/Templates/AppSource App/.github/workflows/PullRequestHandler.yaml
@@ -35,10 +35,6 @@ jobs:
           ref: refs/pull/${{ github.event.number }}/merge
 
       - uses: microsoft/AL-Go-Actions/VerifyPRChanges@main
-        with:
-          baseSHA: ${{ github.event.pull_request.base.sha }}
-          headSHA: ${{ github.event.pull_request.head.sha }}
-          prbaseRepository: ${{ github.event.pull_request.base.repo.full_name }}
 
   Initialization:
     needs: [ PregateCheck ]

diff --git a/Templates/Per Tenant Extension/.github/workflows/PullRequestHandler.yaml b/Templates/Per Tenant Extension/.github/workflows/PullRequestHandler.yaml
@@ -35,10 +35,6 @@ jobs:
           ref: refs/pull/${{ github.event.number }}/merge
 
       - uses: microsoft/AL-Go-Actions/VerifyPRChanges@main
-        with:
-          baseSHA: ${{ github.event.pull_request.base.sha }}
-          headSHA: ${{ github.event.pull_request.head.sha }}
-          prbaseRepository: ${{ github.event.pull_request.base.repo.full_name }}
 
   Initialization:
     needs: [ PregateCheck ]

diff --git a/Tests/VerifyPRChanges.Action.Test.ps1 b/Tests/VerifyPRChanges.Action.Test.ps1
@@ -17,8 +17,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
        { 
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -31,8 +29,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
        { 
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -45,8 +41,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
        { 
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -59,8 +53,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
        { 
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -73,8 +65,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
        { 
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -87,8 +77,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
        { 
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -101,8 +89,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
         Mock Write-Host {}
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -115,8 +101,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
         Mock Write-Host {}
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -129,8 +113,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
         Mock Write-Host {}
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC" 
@@ -142,8 +124,6 @@ Describe 'VerifyPRChanges Action Tests' {
 
        { 
         & $scriptPath `
-                -baseSHA "123" `
-                -headSHA "456" `
                 -prBaseRepository "microsoft/AL-Go" `
                 -pullRequestId "123456" `
                 -token "ABC"