Merge pull request #2130 from bugsnag/release/v6.11.0

Release/v6.11.0
bugsnag · Jan 22, 2025 · 871763c · 871763c
2 parents dc9d5fc + 90a44bd
commit 871763c
Show file tree

Hide file tree

Showing 65 changed files with 1,730 additions and 730 deletions.
diff --git a/.buildkite/block.step.yml b/.buildkite/block.step.yml
@@ -1,7 +1,12 @@
+agents:
+  queue: 'macos'
+
 steps:
-  - block: 'Trigger full build'
+  - label:
+    block: 'Trigger full build'
     key: 'trigger-full-build'
 
   - label: 'Upload the full test pipeline'
     depends_on: 'trigger-full-build'
-    command: buildkite-agent pipeline upload .buildkite/pipeline.full.yml
+    command: buildkite-agent pipeline upload .buildkite/pipeline.full.yml
+    timeout_in_minutes: 5
diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml
@@ -1,3 +1,6 @@
+agents:
+  queue: 'opensource'
+
 steps:
   - label: ':android: Build minimal fixture APK'
     key: "fixture-minimal"
@@ -10,7 +13,7 @@ steps:
       JAVA_VERSION: 17
 
   - label: ':android: Build Example App'
-    timeout_in_minutes: 5
+    timeout_in_minutes: 10
     agents:
       queue: macos-14
     command: 'make example-app'
@@ -230,7 +233,7 @@ steps:
 
   - label: ':browserstack: Android 7 NDK r19 end-to-end tests - ANRs'
     depends_on: "fixture-r19"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -328,7 +331,7 @@ steps:
 
   - label: ':browserstack: Android 8 NDK r19 end-to-end tests - ANRs'
     depends_on: "fixture-r19"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -428,7 +431,7 @@ steps:
 
   - label: ':bitbar: Android 9 NDK r21 end-to-end tests - ANRs'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -529,7 +532,7 @@ steps:
 
   - label: ':browserstack: Android 10 NDK r21 end-to-end tests - ANRs'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -634,7 +637,7 @@ steps:
 
   - label: ':browserstack: Android 11 NDK r21 end-to-end tests - ANRs'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -735,7 +738,7 @@ steps:
 
   - label: ':browserstack: Android 13 NDK r21 end-to-end tests - ANRs'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -836,7 +839,7 @@ steps:
 
   - label: ':browserstack: Android 14 NDK r21 end-to-end tests - ANRs'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -891,6 +894,7 @@ steps:
   - label: 'Publish :rocket:'
     if: build.branch == "master"
     depends_on: 'android-common'
+    timeout_in_minutes: 30
     env:
       BUILDKITE_PLUGIN_S3_SECRETS_BUCKET_PREFIX: bugsnag-android-publish
     plugins:

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,3 +1,6 @@
+agents:
+  queue: 'opensource'
+
 steps:
 
   - label: 'Audit current licenses'
@@ -105,7 +108,7 @@ steps:
   #
   - label: ':bitbar: Android 7 NDK r19 smoke tests'
     depends_on: "fixture-r19"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -139,7 +142,7 @@ steps:
 
   - label: ':browserstack: Android 7 NDK r19 ANR smoke tests'
     depends_on: "fixture-r19"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -170,7 +173,7 @@ steps:
 
   - label: ':bitbar: Android 8 NDK r19 smoke tests'
     depends_on: "fixture-r19"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -202,7 +205,7 @@ steps:
 
   - label: ':browserstack: Android 8 NDK r19 ANR smoke tests'
     depends_on: "fixture-r19"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -231,7 +234,7 @@ steps:
 
   - label: ':bitbar: Android 9 NDK r21 smoke tests'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -265,7 +268,7 @@ steps:
 
   - label: ':browserstack: Android 9 NDK r21 ANR smoke tests'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -292,7 +295,7 @@ steps:
 
   - label: ':bitbar: Android 10 NDK r21 smoke tests'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -326,7 +329,7 @@ steps:
 
   - label: ':browserstack: Android 10 NDK r21 ANR smoke tests'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -358,7 +361,7 @@ steps:
   - label: ':bitbar: Android 11 NDK r21 smoke tests'
     key: 'android-11-smoke'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -393,7 +396,7 @@ steps:
   - label: ':browserstack: Android 11 NDK r21 ANR smoke tests'
     key: 'android-11-anr-smoke'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -532,7 +535,7 @@ steps:
 
   - label: ':bitbar: Android 13 NDK r21 smoke tests'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -566,7 +569,7 @@ steps:
 
   - label: ':browserstack: Android 13 NDK r21 ANR smoke tests'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -597,7 +600,7 @@ steps:
 
   - label: ':bitbar: Android 14 NDK r21 smoke tests'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -631,7 +634,7 @@ steps:
 
   - label: ':browserstack: Android 14 NDK r21 ANR smoke tests'
     depends_on: "fixture-r21"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
@@ -660,9 +663,8 @@ steps:
     concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
-
   - label: 'Conditionally include device farms/full tests'
     agents:
-      queue: macos-14
+      queue: macos
     command: sh -c .buildkite/pipeline_trigger.sh
-
+    timeout_in_minutes: 10
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -10,6 +10,7 @@
 # supported CodeQL languages.
 #
 name: "CodeQL"
+permissions: read-all
 
 on:
   push:
@@ -26,7 +27,7 @@ env:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-22.04' }}
     permissions:
       actions: read
       contents: read
@@ -42,49 +43,52 @@ jobs:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    - uses: gradle/wrapper-validation-action@v1
+      - name: Checkout repository
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        with:
+          submodules: recursive
+      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 #v1.1.0
 
-    - uses: actions/setup-java@v3
-      with:
-        distribution: 'zulu'
-        java-version: 11
+      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #v3.13.0
+        with:
+          distribution: 'zulu'
+          java-version: 11
 
-    - name: Gradle cache
-      uses: gradle/gradle-build-action@v2
+      - name: Gradle cache
+        uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2.12.0
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@396bb3e45325a47dd9ef434068033c6d5bb0d11a #v3.27.3
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
 
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
 
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+#        uses: github/codeql-action/autobuild@396bb3e45325a47dd9ef434068033c6d5bb0d11a #v3.27.3
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-    # - run: |
-    #     echo "Run, Build Application using script"
-    #     ./location_of_script_within_repo/buildscript.sh
+      # - run: |
+      #     echo "Run, Build Application using script"
+      #     ./location_of_script_within_repo/buildscript.sh
+        run: |
+          echo "Run, Build Application using script"
+          ./gradlew --no-daemon assemble
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@396bb3e45325a47dd9ef434068033c6d5bb0d11a #v3.27.3
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/downstream_updates.yml b/.github/workflows/downstream_updates.yml
@@ -1,4 +1,5 @@
 name: downstream-updates
+permissions: read-all
 
 on:
   release: