Merge pull request #3822 from brandonpage/cleanup-github-actions

Fix Github Actions issues.

Author: brandonpage

.github/DangerFiles/StaticAnalysis.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'plist'
 
 # Markdown table character length without any issues
@@ -6,7 +8,7 @@
 
 files = Set[]
 for lib in LIBS;
-    files.merge(Dir["../../libs/#{lib}/clangReport/StaticAnalyzer/#{lib}/#{lib}/normal/**/*.plist"])
+    files.merge(Dir["libs/#{lib}/clangReport/StaticAnalyzer/#{lib}/#{lib}/normal/**/*.plist"])
 end
 print "Found #{files.count} classes with static analysis files.\n"
 

.github/DangerFiles/TestOrchestrator.rb

@@ -1,3 +1,11 @@
+#!/usr/bin/env ruby
+
+# Warn when there is a big PR
+warn("Big PR, try to keep changes smaller if you can.", sticky: true) if git.lines_of_code > 1000
+
+# Redirect contributors to PR to dev.
+fail("Please re-submit this PR to the dev branch, we may have already fixed your issue.", sticky: true) if github.branch_for_base != "dev"
+
 # List of supported xcode schemes for testing
 SCHEMES = ['SalesforceSDKCommon', 'SalesforceAnalytics', 'SalesforceSDKCore', 'SmartStore', 'MobileSync']
 

.github/DangerFiles/TestResults.rb

@@ -1,8 +1,10 @@
+#!/usr/bin/env ruby
+
 xcode_summary.ignores_warnings = true
 xcode_summary.inline_mode = true
 
-if File.exist?('../../test.xcresult')
-    xcode_summary.report '../../test.xcresult'
+if File.exist?('test.xcresult')
+    xcode_summary.report 'test.xcresult'
 else
     fail "No test results found."
 end

.github/workflows/nightly.yaml

@@ -1,11 +1,13 @@
 name: Nightly Tests
 
-on: 
+on:
   schedule:
     - cron: "0 5 * * 3,5"  # cron is UTC, this translates to 10 PM PST Tues and Thur.
+  # This lets us trigger the workflow from a browser.
+  workflow_dispatch:
 
 jobs:
-  ios-pr:
+  ios-nightly:
     strategy:
       fail-fast: false
       matrix:

.github/workflows/pr.yaml

@@ -1,14 +1,14 @@
 name: Pull Request
 
 on:
-  # Dangerious without Member Check setup!
   pull_request_target:
-    branches:
-      - dev
+    branches: [dev, master]
 
 jobs:
   static-analysis:
     runs-on: macos-15
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/.github/DangerFiles/Gemfile
     steps:
       - name: Check Write Permission
         uses: octokit/request-action@v2.x
@@ -34,7 +34,7 @@ jobs:
           # We need a sufficient depth or Danger will occasionally run into issues checking which files were modified.
           fetch-depth: 100
           # This is dangerous without the member check
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.head_ref }}
       - name: Install Dependencies
         run: |
           npm install shelljs@0.8.5
@@ -45,13 +45,14 @@ jobs:
         run:
           xcodebuild analyze -workspace SalesforceMobileSDK.xcworkspace -scheme MobileSync -sdk 'iphonesimulator' \
           CLANG_ANALYZER_OUTPUT=plist-html CLANG_ANALYZER_OUTPUT_DIR=./clangReport RUN_CLANG_STATIC_ANALYZER=YES
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
       - name: Report Static Analysis
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          cd .github/DangerFiles
-          bundle update && bundle install
-          bundle exec danger --dangerfile=StaticAnalysis.rb --danger_id=StaticAnalysis
+        run: bundle exec danger --dangerfile=StaticAnalysis.rb --danger_id=StaticAnalysis
 
   test-orchestrator:
     runs-on: macos-15

.github/workflows/reusable-workflow.yaml

@@ -1,5 +1,4 @@
 on:
-  workflow_dispatch:
   workflow_call:
     inputs:
       lib:
@@ -21,12 +20,15 @@ on:
 jobs:
   test-ios:
     runs-on: ${{ inputs.macos }}
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/.github/DangerFiles/Gemfile
     steps:
       - uses: actions/checkout@v4
         # We need a sufficient depth or Danger will occasionally run into issues 
         # checking which files were modified.
         with:
           fetch-depth: 100
+          ref: ${{ github.head_ref }}
       - name: Install Dependencies
         env: 
           TEST_CREDENTIALS: ${{ secrets.TEST_CREDENTIALS }}
@@ -44,14 +46,15 @@ jobs:
           code-coverage: true
           upload-logs: always
           verbosity: xcbeautify
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
       - name: Danger Test Results
         if: (github.event_name == 'pull_request') && failure()
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          cd .github/DangerFiles
-          bundle update && bundle install
-          bundle exec danger --dangerfile=TestResults.rb --danger_id=${{ inputs.lib }}
+        run: bundle exec danger --dangerfile=TestResults.rb --danger_id=${{ inputs.lib }}
       - uses: codecov/codecov-action@v4
         with:
           flags: ${{ inputs.lib }}