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

NDEV-2081: Upgrade Solana to v1.16.11 #170

Closed
wants to merge 3 commits into from
Closed

NDEV-2081: Upgrade Solana to v1.16.11 #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d402e9
Upgrade Solana to v1.16.11
andreisilviudragnea Aug 30, 2023
9701481
cargo clippy
andreisilviudragnea Aug 30, 2023
0e60947
Use neon-evm-1 label
andreisilviudragnea Aug 31, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
DOCKER_USER = os.environ.get("DHUBU")
DOCKER_PASSWORD = os.environ.get("DHUBP")
IMAGE_NAME = 'neonlabsorg/evm_loader'
SOLANA_NODE_VERSION = 'v1.14.20'
SOLANA_BPF_VERSION = 'v1.14.20'
SOLANA_NODE_VERSION = 'v1.16.11'
SOLANA_BPF_VERSION = 'v1.16.11'

VERSION_BRANCH_TEMPLATE = r"[vt]{1}\d{1,2}\.\d{1,2}\.x.*"
docker_client = docker.APIClient()
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
cancel-in-progress: true
jobs:
build-neon-evm:
runs-on: build-runner
runs-on: neon-evm-1
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -36,7 +36,7 @@ jobs:
python3 ./.github/workflows/deploy.py publish_image \
--github_sha=${GITHUB_SHA}
run-neon-evm-tests:
runs-on: test-runner
runs-on: neon-evm-1
needs:
- build-neon-evm
steps:
Expand All @@ -48,7 +48,7 @@ jobs:
python3 ./.github/workflows/deploy.py run_tests \
--github_sha=${GITHUB_SHA}
trigger-proxy-tests:
runs-on: trigger-runner
runs-on: neon-evm-1
needs:
- build-neon-evm
steps:
Expand All @@ -66,7 +66,7 @@ jobs:
--is_draft=${{github.event.pull_request.draft}} \
--labels='${{ toJson(github.event.pull_request.labels.*.name) }}'
finalize-image:
runs-on: build-runner
runs-on: neon-evm-1
needs:
- trigger-proxy-tests
- run-neon-evm-tests
Expand Down
19 changes: 9 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
ARG SOLANA_IMAGE
# Install BPF SDK
FROM solanalabs/rust:1.64.0 AS builder
FROM solanalabs/rust:1.69.0 AS builder
RUN cargo install rustfilt
WORKDIR /opt
ARG SOLANA_BPF_VERSION
RUN sh -c "$(curl -sSfL https://release.solana.com/"${SOLANA_BPF_VERSION}"/install)" && \
/root/.local/share/solana/install/active_release/bin/sdk/bpf/scripts/install.sh
RUN sh -c "$(curl -sSfL https://release.solana.com/"${SOLANA_BPF_VERSION}"/install)"
ENV PATH=/root/.local/share/solana/install/active_release/bin:/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin


Expand All @@ -18,13 +17,13 @@ ENV NEON_REVISION=${REVISION}
RUN cargo fmt --check && \
cargo clippy --release && \
cargo build --release && \
cargo build-sbf --arch bpf --features devnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-devnet.so && \
cargo build-sbf --arch bpf --features testnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-testnet.so && \
cargo build-sbf --arch bpf --features govertest && cp target/deploy/evm_loader.so target/deploy/evm_loader-govertest.so && \
cargo build-sbf --arch bpf --features govertest,emergency && cp target/deploy/evm_loader.so target/deploy/evm_loader-govertest-emergency.so && \
cargo build-sbf --arch bpf --features mainnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet.so && \
cargo build-sbf --arch bpf --features mainnet,emergency && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet-emergency.so && \
cargo build-sbf --arch bpf --features ci --dump
cargo build-bpf --features devnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-devnet.so && \
cargo build-bpf --features testnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-testnet.so && \
cargo build-bpf --features govertest && cp target/deploy/evm_loader.so target/deploy/evm_loader-govertest.so && \
cargo build-bpf --features govertest,emergency && cp target/deploy/evm_loader.so target/deploy/evm_loader-govertest-emergency.so && \
cargo build-bpf --features mainnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet.so && \
cargo build-bpf --features mainnet,emergency && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet-emergency.so && \
cargo build-bpf --features ci --dump

# Build Solidity contracts
FROM ethereum/solc:0.8.0 AS solc
Expand Down
Loading