Merge remote-tracking branch 'origin/master' into docs-secp256k1

solana-labs · Aug 7, 2022 · f175667 · f175667
2 parents 7e606e3 + ed8c224
commit f175667
Show file tree

Hide file tree

Showing 267 changed files with 40,902 additions and 9,664 deletions.
diff --git a/.github/workflows/client-targets.yml b/.github/workflows/client-targets.yml
@@ -11,8 +11,6 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  ANDROID_SDK_ROOT: /usr/local/lib/android/sdk
-  ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/21.4.7075529
 
 jobs:
   check_compilation:
@@ -56,6 +54,13 @@ jobs:
       - name: Install cargo-ndk
         if: ${{ matrix.platform == 'android' }}
         run: cargo install cargo-ndk
+      - name: Install NDK 21
+        if: ${{ matrix.platform == 'android' }}
+        run: |
+          ANDROID_ROOT=/usr/local/lib/android
+          ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
+          SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
+          echo "y" | $SDKMANAGER "ndk;21.4.7075529"
       - uses: actions-rs/cargo@v1
         if: ${{ matrix.platform == 'android' }}
         with:

diff --git a/.mergify.yml b/.mergify.yml
@@ -107,32 +107,33 @@ pull_request_rules:
       label:
         add:
           - automerge
-  - name: v1.9 feature-gate backport
+  - name: v1.10 feature-gate backport
     conditions:
-      - label=v1.9
+      - label=v1.10
       - label=feature-gate
     actions:
       backport:
         assignees: &BackportAssignee
-          - "{{ merged_by|replace('mergify[bot]', label|select('equalto', 'community')|first|default(author)|replace('community', '@solana-labs/community-pr-subscribers')) }}"
+          - "{{ merged_by|replace('mergify[bot]', label|select('equalto', 'community')|first|default(author)|replace('community', '@solana-labs/community-pr-s
+ubscribers')) }}"
         ignore_conflicts: true
         labels:
           - feature-gate
         branches:
-          - v1.9
-  - name: v1.9 non-feature-gate backport
+          - v1.10
+  - name: v1.10 non-feature-gate backport
     conditions:
-      - label=v1.9
+      - label=v1.10
       - label!=feature-gate
     actions:
       backport:
         assignees: *BackportAssignee
         ignore_conflicts: true
         branches:
-          - v1.9
-  - name: v1.10 feature-gate backport
+          - v1.10
+  - name: v1.11 feature-gate backport
     conditions:
-      - label=v1.10
+      - label=v1.11
       - label=feature-gate
     actions:
       backport:
@@ -141,17 +142,17 @@ pull_request_rules:
         labels:
           - feature-gate
         branches:
-          - v1.10
-  - name: v1.10 non-feature-gate backport
+          - v1.11
+  - name: v1.11 non-feature-gate backport
     conditions:
-      - label=v1.10
+      - label=v1.11
       - label!=feature-gate
     actions:
       backport:
         assignees: *BackportAssignee
         ignore_conflicts: true
         branches:
-          - v1.10
+          - v1.11
 
 commands_restrictions:
   # The author of copied PRs is the Mergify user.