Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
lijunwangs committed Apr 3, 2024
2 parents 83a84c9 + afa65c6 commit c1d9a55
Show file tree
Hide file tree
Showing 258 changed files with 11,837 additions and 4,854 deletions.
4 changes: 4 additions & 0 deletions .github/scripts/cargo-clippy-before-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ os_name="$1"

case "$os_name" in
"Windows")
vcpkg install openssl:x64-windows-static-md
vcpkg integrate install
choco install protoc
export PROTOC='C:\ProgramData\chocolatey\lib\protoc\tools\bin\protoc.exe'
;;
"macOS")
brew install protobuf
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
matrix:
os:
- macos-latest-large
- windows-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -53,6 +54,7 @@ jobs:
matrix:
os:
- macos-latest-large
- windows-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Check if changes to CHANGELOG.md
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/client-targets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- armv7-linux-androideabi
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: cargo install [email protected]

Expand All @@ -55,7 +55,7 @@ jobs:
- x86_64-apple-darwin
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Rust
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crate-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
check:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/downstream-project-anchor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
matrix:
version: ["v0.29.0"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- shell: bash
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/downstream-project-spl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- shell: bash
run: |
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
},
]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- shell: bash
run: |
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
- [single-pool/program]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- shell: bash
run: |
Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/increment-cargo-version-on-release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
channel: ${{ steps.build.outputs.channel }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
Expand Down
89 changes: 89 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: Release

on:
push:
tags:
- "*"

jobs:
trigger-buildkite-pipeline:
runs-on: ubuntu-latest
steps:
- name: Trigger a Buildkite Build
uses: "buildkite/[email protected]"
with:
buildkite_api_access_token: ${{ secrets.TRIGGER_BK_BUILD_TOKEN }}
pipeline: "anza/agave-secondary"
branch: "${{ github.ref_name }}"
build_env_vars: '{"TRIGGERED_BUILDKITE_TAG": "${{ github.ref_name }}"}'
commit: "HEAD"
message: ":github: Triggered from a GitHub Action"

draft-release:
runs-on: ubuntu-latest
steps:
- name: Create Release
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: '${{ github.ref_name }}',
name: 'Release ${{ github.ref_name }}',
body: '🚧',
draft: false,
prerelease: true
})
version-bump:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Parse Info
id: parse_info
run: |
# get the next version
version=${{ github.ref_name }}
major=$(echo $version | cut -d'.' -f1)
minor=$(echo $version | cut -d'.' -f2)
patch=$(echo $version | cut -d'.' -f3)
next_version=$major.$minor.$((patch+1))
: "${next_version:?}"
# get the traget branch
target_branch=$major.$minor
: "${target_branch:?}"
echo "next_version=$next_version" | tee -a $GITHUB_OUTPUT
echo "target_branch=$target_branch" | tee -a $GITHUB_OUTPUT
- name: Create branch and make changes
run: |
next_version=${{ steps.parse_info.outputs.next_version }}
git checkout -b version-bump-$next_version
./scripts/increment-cargo-version.sh patch
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config user.name "github-actions[bot]"
git commit -am "Bump version to $next_version"
git push origin version-bump-$next_version
- name: Create PR
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.pulls.create({
owner: context.repo.owner,
repo: context.repo.repo,
title: 'Bump version to ${{ steps.parse_info.outputs.next_version }}',
head: 'version-bump-${{ steps.parse_info.outputs.next_version }}',
base: '${{ steps.parse_info.outputs.target_branch }}'
})
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ Release channels have their own copy of this changelog:
* Changes
* `central-scheduler` as default option for `--block-production-method` (#34891)
* `solana-rpc-client-api`: `RpcFilterError` depends on `base64` version 0.22, so users may need to upgrade to `base64` version 0.22
* Changed default value for `--health-check-slot-distance` from 150 to 128
* CLI: Can specify `--with-compute-unit-price` and `--max-sign-attempts` during program deployment

## [1.18.0]
* Changes
Expand All @@ -38,6 +40,7 @@ Release channels have their own copy of this changelog:
double the size. Program accounts must be extended with `solana program extend`
before an upgrade if they need to accommodate larger programs.
* Interface for `gossip_service::get_client()` has changed. `gossip_service::get_multi_client()` has been removed.
* CLI: Can specify `--with-compute-unit-price` and `--max-sign-attempts` during program deployment
* Upgrade Notes
* `solana-program` and `solana-sdk` default to support for Borsh v1, with
limited backward compatibility for v0.10 and v0.9. Please upgrade to Borsh v1.
Expand Down
Loading

0 comments on commit c1d9a55

Please sign in to comment.