Skip to content

Commit

Permalink
NDEV-2222: Add build-info to neon-cli and neon-api (#200)
Browse files Browse the repository at this point in the history
  • Loading branch information
andreisilviudragnea authored and afalaleev committed Oct 11, 2023
1 parent 7439b51 commit 882adc0
Show file tree
Hide file tree
Showing 20 changed files with 388 additions and 12 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ Dockerfile
Dockerfile.*
.*.swp

.git
.github
.gitignore
.gitmodules
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENV PATH=/root/.local/share/solana/install/active_release/bin:/usr/local/cargo/b

# Build evm_loader
FROM builder AS evm-loader-builder
COPY ./evm_loader/ /opt/evm_loader/
WORKDIR /opt/evm_loader
COPY . /opt/neon-evm/
WORKDIR /opt/neon-evm/evm_loader
ARG REVISION
ENV NEON_REVISION=${REVISION}
RUN cargo fmt --check && \
Expand Down Expand Up @@ -73,10 +73,10 @@ RUN /opt/solana/bin/solana program dump metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518
COPY evm_loader/solana-run-neon.sh \
/opt/solana/bin/

COPY --from=evm-loader-builder /opt/evm_loader/target/deploy/evm_loader*.so /opt/
COPY --from=evm-loader-builder /opt/evm_loader/target/deploy/evm_loader-dump.txt /opt/
COPY --from=evm-loader-builder /opt/evm_loader/target/release/neon-cli /opt/
COPY --from=evm-loader-builder /opt/evm_loader/target/release/neon-api /opt/
COPY --from=evm-loader-builder /opt/neon-evm/evm_loader/target/deploy/evm_loader*.so /opt/
COPY --from=evm-loader-builder /opt/neon-evm/evm_loader/target/deploy/evm_loader-dump.txt /opt/
COPY --from=evm-loader-builder /opt/neon-evm/evm_loader/target/release/neon-cli /opt/
COPY --from=evm-loader-builder /opt/neon-evm/evm_loader/target/release/neon-api /opt/
COPY --from=solana /usr/bin/spl-token /opt/spl-token
COPY --from=contracts /opt/ /opt/solidity/
COPY --from=contracts /usr/bin/solc /usr/bin/solc
Expand Down
234 changes: 234 additions & 0 deletions evm_loader/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions evm_loader/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ http = "0.2.9"
hyper = "0.14.27"
tower-http = { version = "0.4.4", features = ["trace"] }
hex = "0.4.2"
build-info = { version = "0.0.31", features = ["serde"] }

[build-dependencies]
build-info-build = "0.0.31"
3 changes: 3 additions & 0 deletions evm_loader/api/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
build_info_build::build_script();
}
Loading

0 comments on commit 882adc0

Please sign in to comment.