Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump platform tools version #77

Merged
merged 5 commits into from
Jul 24, 2024
Merged

Bump platform tools version #77

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
823a61a
Bump tools version
LucasSte Jul 19, 2024
0b87d2f
Update CI macos target
LucasSte Jul 22, 2024
c9dd00b
Update build script
LucasSte Jul 22, 2024
75fb36f
Install swig on macos
LucasSte Jul 23, 2024
6cd7833
Fix architecture name
LucasSte Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
matrix:
include:
- target: x86_64-unknown-linux-gnu
arch: x86_64
os: ubuntu-20.04
ninja_file: ninja-linux.zip
ninja_sha: b901ba96e486dce377f9a070ed4ef3f79deb45f4ffe2938f8e7ddc69cfb3df77
Expand All @@ -28,7 +29,8 @@ jobs:
rust: stable
tar: linux
out_dir: out
- target: x86_64-apple-darwin
- target: aarch64-apple-darwin
arch: aarch64
os: macos-latest
ninja_file: ninja-mac.zip
ninja_sha: 482ecb23c59ae3d4f158029112de172dd96bb0e97549c4b1ca32d8fad11f873e
Expand All @@ -38,6 +40,7 @@ jobs:
tar: osx
out_dir: out
- target: x86_64-pc-windows-msvc
arch: x86_64
os: windows-latest
ninja_file: ninja-win.zip
ninja_sha: 524b344a1a9a55005eaf868d991e090ab8ce07fa109f1820d40e74642e289abc
Expand All @@ -48,9 +51,9 @@ jobs:
out_dir: /c/out
steps:
- uses: actions/checkout@v1
- name: Install coreutils
- name: Install coreutils and swig
run: |
brew update && brew install coreutils
brew update && brew install coreutils && brew install swig
if: matrix.os == 'macos-latest'
shell: bash
- name: Install Ninja
Expand All @@ -60,23 +63,20 @@ jobs:
${{ matrix.ninja_sudo }} unzip ${{ matrix.ninja_file }} -d ${{ matrix.ninja_dir }} && rm ${{ matrix.ninja_file }}
shell: bash
- name: Install Rust
run: |
rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
rustup target add ${{ matrix.target }}
shell: bash
uses: dtolnay/rust-toolchain@stable
- name: Build
run: ./build.sh ${{ matrix.out_dir }}
shell: bash
- name: Upload ${{ matrix.tar }} tarball
uses: actions/upload-artifact@v3
with:
name: platform-tools-${{ matrix.tar }}-x86_64.tar.bz2
path: platform-tools-${{ matrix.tar }}-x86_64.tar.bz2
name: platform-tools-${{ matrix.tar }}-${{ matrix.arch }}.tar.bz2
path: platform-tools-${{ matrix.tar }}-${{ matrix.arch }}.tar.bz2
- name: Upload move-dev ${{ matrix.tar }} tarball
uses: actions/upload-artifact@v3
with:
name: move-dev-${{ matrix.tar }}-x86_64.tar.bz2
path: move-dev-${{ matrix.tar }}-x86_64.tar.bz2
name: move-dev-${{ matrix.tar }}-${{ matrix.arch }}.tar.bz2
path: move-dev-${{ matrix.tar }}-${{ matrix.arch }}.tar.bz2

release:
name: Upload Release Assets
Expand All @@ -95,11 +95,11 @@ jobs:
- name: Download macOS tarball
uses: actions/download-artifact@v3
with:
name: platform-tools-osx-x86_64.tar.bz2
name: platform-tools-osx-aarch.tar.bz2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be aarch64?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed that one. Thanks for catching.

- name: Download macOS move-dev
uses: actions/download-artifact@v3
with:
name: move-dev-osx-x86_64.tar.bz2
name: move-dev-osx-aarch64.tar.bz2
- name: Download Windows tarball
uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -145,8 +145,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: platform-tools-osx-x86_64.tar.bz2
asset_name: platform-tools-osx-x86_64.tar.bz2
asset_path: platform-tools-osx-aarch64.tar.bz2
asset_name: platform-tools-osx-aarch64.tar.bz2
asset_content_type: application/zip
- name: Release macOS move-dev
id: upload-release-macos-move
Expand All @@ -155,8 +155,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: move-dev-osx-x86_64.tar.bz2
asset_name: move-dev-osx-x86_64.tar.bz2
asset_path: move-dev-osx-aarch64.tar.bz2
asset_name: move-dev-osx-aarch64.tar.bz2
asset_content_type: application/zip
- name: Release Windows tarball
id: upload-release-windows
Expand Down
8 changes: 4 additions & 4 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ case "${unameOut}" in
esac

cd "$(dirname "$0")"
OUT_DIR=$(realpath "${1:-out}")
OUT_DIR="$(realpath ./)/${1:-out}"

rm -rf "${OUT_DIR}"
mkdir -p "${OUT_DIR}"
pushd "${OUT_DIR}"

git clone --single-branch --branch solana-tools-v1.41 --recurse-submodules --shallow-submodules https://github.com/anza-xyz/rust.git
git clone --single-branch --branch solana-tools-v1.42 --recurse-submodules --shallow-submodules https://github.com/anza-xyz/rust.git
echo "$( cd rust && git rev-parse HEAD ) https://github.com/anza-xyz/rust.git" >> version.md

git clone --single-branch --branch solana-tools-v1.41 https://github.com/anza-xyz/cargo.git
git clone --single-branch --branch solana-tools-v1.42 https://github.com/anza-xyz/cargo.git
echo "$( cd cargo && git rev-parse HEAD ) https://github.com/anza-xyz/cargo.git" >> version.md

pushd rust
Expand All @@ -57,7 +57,7 @@ fi
popd

if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
git clone --single-branch --branch solana-tools-v1.41 https://github.com/anza-xyz/newlib.git
git clone --single-branch --branch solana-tools-v1.42 https://github.com/anza-xyz/newlib.git
echo "$( cd newlib && git rev-parse HEAD ) https://github.com/anza-xyz/newlib.git" >> version.md
mkdir -p newlib_build
mkdir -p newlib_install
Expand Down
Loading