Merge branch 'master' into simd48

.buildkite/scripts/build-stable.sh

@@ -15,7 +15,7 @@ partitions=$(
   "command": ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/stable/run-partition.sh",
   "timeout_in_minutes": 30,
   "agent": "$agent",
-  "parallelism": 3,
+  "parallelism": 2,
   "retry": 3
 }
 EOF

.github/ISSUE_TEMPLATE/2-feature-gate.yml

@@ -24,6 +24,14 @@ body:
         `solana_sdk::declare_id!()` within the module. Additionally, add an entry to `FEATURE_NAMES` map.
 
         3. Add desired logic to check for and switch on feature availability.
+  - type: input
+    id: simd
+    attributes:
+      label: SIMD
+      description: Solana IMprovement Document (SIMD)
+      placeholder: Link to the https://github.com/solana-foundation/solana-improvement-documents document for this feature
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes:

.github/scripts/check-changelog.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -uo pipefail
+
+CHANGELOG_FILE="CHANGELOG.md"
+echo "Checking: git diff --exit-code origin/${BASE_REF} -- ${CHANGELOG_FILE}"
+
+if git diff --exit-code "origin/${BASE_REF}" -- "${CHANGELOG_FILE}"; then
+    >&2 echo "Error: this pull request requires an entry in $CHANGELOG_FILE, but no entry was found"
+    exit 1
+fi

.github/workflows/changelog-label.yml

@@ -0,0 +1,20 @@
+name: Require changelog entry
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
+
+jobs:
+  check-changelog:
+    if: contains(github.event.pull_request.labels.*.name, 'changelog')
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Check if changes to CHANGELOG.md
+      shell: bash
+      env:
+        BASE_REF: ${{ github.event.pull_request.base.ref }}
+      run: .github/scripts/check-changelog.sh

.github/workflows/client-targets.yml

@@ -12,6 +12,8 @@ on:
       - "sdk/**"
       - ".github/workflows/client-targets.yml"
       - "ci/rust-version.sh"
+      - "**/Cargo.toml"
+      - "**/Cargo.lock"
 
 env:
   CARGO_TERM_COLOR: always

.github/workflows/release-artifacts.yml

@@ -47,7 +47,17 @@ jobs:
         id: build
         shell: bash
         run: |
-          export OPENSSL_DIR="C:\Program Files\OpenSSL"
+          choco install openssl
+          if [[ -d "C:\Program Files\OpenSSL" ]]; then
+            echo "OPENSSL_DIR: C:\Program Files\OpenSSL"
+            export OPENSSL_DIR="C:\Program Files\OpenSSL"
+          elif [[ -d "C:\Program Files\OpenSSL-Win64" ]]; then
+            echo "OPENSSL_DIR: C:\Program Files\OpenSSL-Win64"
+            export OPENSSL_DIR="C:\Program Files\OpenSSL-Win64"
+          else
+            echo "can't determine OPENSSL_DIR"
+            exit 1
+          fi
           choco install protoc
           export PROTOC="C:\ProgramData\chocolatey\lib\protoc\tools\bin\protoc.exe"
           source /tmp/env.sh

.mergify.yml

@@ -73,9 +73,9 @@ pull_request_rules:
           - automerge
       comment:
         message: automerge label removed due to a CI failure
-  - name: v1.14 feature-gate backport
+  - name: v1.16 feature-gate backport
     conditions:
-      - label=v1.14
+      - label=v1.16
       - label=feature-gate
     actions:
       backport:
@@ -86,21 +86,21 @@ pull_request_rules:
         labels:
           - feature-gate
         branches:
-          - v1.14
-  - name: v1.14 non-feature-gate backport
+          - v1.16
+  - name: v1.16 non-feature-gate backport
     conditions:
-      - label=v1.14
+      - label=v1.16
       - label!=feature-gate
     actions:
       backport:
         assignees: *BackportAssignee
         title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
         ignore_conflicts: true
         branches:
-          - v1.14
-  - name: v1.16 feature-gate backport
+          - v1.16
+  - name: v1.17 feature-gate backport
     conditions:
-      - label=v1.16
+      - label=v1.17
       - label=feature-gate
     actions:
       backport:
@@ -110,18 +110,18 @@ pull_request_rules:
         labels:
           - feature-gate
         branches:
-          - v1.16
-  - name: v1.16 non-feature-gate backport
+          - v1.17
+  - name: v1.17 non-feature-gate backport
     conditions:
-      - label=v1.16
+      - label=v1.17
       - label!=feature-gate
     actions:
       backport:
         assignees: *BackportAssignee
         title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
         ignore_conflicts: true
         branches:
-          - v1.16
+          - v1.17
 
 commands_restrictions:
   # The author of copied PRs is the Mergify user.

CHANGELOG.md

@@ -4,15 +4,20 @@ All notable changes to this project will be documented in this file.
 Please follow the [guidance](#adding-to-this-changelog) at the bottom of this file when making changes
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
-and follows a [Backwards Compatability Policy](https://docs.solana.com/developing/backwards-compatibility)
+and follows a [Backwards Compatibility Policy](https://docs.solana.com/developing/backwards-compatibility)
 
 Release channels have their own copy of this changelog:
-* [edge - v1.17](#edge-channel)
-* [beta - v1.16](https://github.com/solana-labs/solana/blob/v1.16/CHANGELOG.md)
-* [stable - v1.14](https://github.com/solana-labs/solana/blob/v1.14/CHANGELOG.md)
+* [edge - v1.18](#edge-channel)
+* [beta - v1.17](https://github.com/solana-labs/solana/blob/v1.17/CHANGELOG.md)
+* [stable - v1.16](https://github.com/solana-labs/solana/blob/v1.16/CHANGELOG.md)
 
 <a name="edge-channel"></a>
-## [1.17.0] - Unreleased
+## [1.18.0] - Unreleased
+* Changes
+  * Added a github check to support `changelog` label
+* Upgrade Notes
+
+## [1.17.0]
 * Changes
   * Added a changelog.
 * Upgrade Notes
@@ -49,8 +54,9 @@ This simplifies the process of diffing between versions of the log.
 ## Maintaining This Changelog
 ### When creating a new release branch:
 * Commit to master updating the changelog:
-  * Remove `Unreleased` annotation from vx.y.0 section.
+  * Update the edge, beta, and stable links
   * Create new section: `vx.y+1.0 - Unreleased`
+  * Remove `Unreleased` annotation from vx.y.0 section.
 * Create vx.y branch starting at that commit
 * Tag that commit as vx.y.0
 

CONTRIBUTING.md

@@ -159,7 +159,7 @@ New feature gates should also always have a corresponding tracking issue
 and should be updated each time the feature is activated on a cluster.
 
 * "automerge": When a PR is labelled with "automerge", the PR will be
-automically merged once CI passes.  In general, this label should only
+automatically merged once CI passes.  In general, this label should only
 be used for small hot-fix (fewer than 100 lines) or automatic generated
 PRs.  If you're uncertain, it's usually the case that the PR is not
 qualified as "automerge".
@@ -250,7 +250,7 @@ before the PR can be merged.  Here are the steps:
 * Under the newly-created directory, create a Cargo.toml file.  Below is an
   example template:
 
-```
+```toml
 [package]
 name = "solana-<PACKAGE_NAME>"
 version = "0.0.1"
@@ -285,7 +285,9 @@ edition = "2021"
 * All Rust code is linted with Clippy. If you'd prefer to ignore its advice, do
   so explicitly:
 
-  ```rust #[allow(clippy::too_many_arguments)] ```
+  ```rust
+  #[allow(clippy::too_many_arguments)]
+  ```
 
   Note: Clippy defaults can be overridden in the top-level file `.clippy.toml`.