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.

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

chore(ampd): add openssl dependency as a vendored dependency to enable arm compilation #630

Merged
merged 19 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ba30265
chore: add openssl dependency as a vendored dependency
apolikamixitos Sep 18, 2024
79d9c17
update cargo lock file
apolikamixitos Sep 18, 2024
ba24b84
Merge branch 'main' into fixes/fix-openssl-arm64-deps-build
apolikamixitos Sep 18, 2024
0c1af27
sort cargo dependencies with cargo sort
apolikamixitos Sep 18, 2024
38f78ba
Merge branch 'fixes/fix-openssl-arm64-deps-build' of github.com:axela…
apolikamixitos Sep 18, 2024
3912617
Update ampd/Cargo.toml
cgorenflo Sep 19, 2024
510b05f
Revert "ci: remove linux-arm64 support for ampd (#629)"
apolikamixitos Sep 19, 2024
0d806a8
Merge branch 'fixes/fix-openssl-arm64-deps-build' of github.com:axela…
apolikamixitos Sep 19, 2024
e23bedb
Merge branch 'main' into fixes/fix-openssl-arm64-deps-build
apolikamixitos Sep 19, 2024
24c4dfd
Update .github/workflows/build-ampd-release.yaml
cgorenflo Sep 19, 2024
f6e4831
Update .github/workflows/build-ampd-release.yaml
cgorenflo Sep 19, 2024
9c608c5
Update .github/workflows/build-ampd-release.yaml
cgorenflo Sep 19, 2024
eb7f1b2
Update .github/workflows/build-ampd-release.yaml
cgorenflo Sep 19, 2024
00547cf
Update .github/workflows/build-ampd-release.yaml
cgorenflo Sep 19, 2024
6a30dad
Update .github/workflows/build-ampd-release.yaml
cgorenflo Sep 19, 2024
0a4f8e7
Update .github/workflows/build-ampd-release.yaml
cgorenflo Sep 19, 2024
03c3711
Merge branch 'main' into fixes/fix-openssl-arm64-deps-build
cgorenflo Sep 19, 2024
26e121f
Merge branch 'main' into fixes/fix-openssl-arm64-deps-build
cgorenflo Sep 20, 2024
f87d5c9
Merge branch 'main' into fixes/fix-openssl-arm64-deps-build
cgorenflo Sep 20, 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
30 changes: 18 additions & 12 deletions .github/workflows/build-ampd-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ jobs:
matrix:
os: [ ubuntu-22.04, macos-12 ]
arch: [ amd64, arm64 ]
exclude:
- os: ubuntu-22.04
arch: arm64

permissions:
contents: write
Expand Down Expand Up @@ -99,7 +96,7 @@ jobs:
mv "/Users/runner/work/axelar-amplifier/axelar-amplifier/target/release/ampd" "./ampdbin/ampd-$OS-$ARCH-$SEMVER"
fi

gpg --armor --detach-sign "./ampdbin/ampd-$OS-$ARCH-$SEMVER"
gpg --armor --detach-sign "./ampdbin/ampd-$OS-$ARCH-$SEMVER"
cgorenflo marked this conversation as resolved.
Show resolved Hide resolved

- name: build and sign linux binaries
env:
Expand All @@ -108,14 +105,22 @@ jobs:
run: |
OS="linux"
ARCH="${{ matrix.arch }}"

sudo apt-get install libssl-dev protobuf-compiler

cargo build --release
mkdir ampdbin
mv "/home/runner/work/axelar-amplifier/axelar-amplifier/target/release/ampd" "./ampdbin/ampd-$OS-$ARCH-$SEMVER"

gpg --armor --detach-sign "./ampdbin/ampd-$OS-$ARCH-$SEMVER"
if [ "$ARCH" == "arm64" ]
then
sudo apt-get install protobuf-compiler gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
rustup target add aarch64-unknown-linux-gnu
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
cargo build --release --target aarch64-unknown-linux-gnu
mkdir ampdbin
mv "/home/runner/work/axelar-amplifier/axelar-amplifier/target/aarch64-unknown-linux-gnu/release/ampd" "./ampdbin/ampd-$OS-$ARCH-$SEMVER"
gpg --armor --detach-sign "./ampdbin/ampd-$OS-$ARCH-$SEMVER"
else
sudo apt-get install protobuf-compiler
cargo build --release
mkdir ampdbin
mv "/home/runner/work/axelar-amplifier/axelar-amplifier/target/release/ampd" "./ampdbin/ampd-$OS-$ARCH-$SEMVER"
gpg --armor --detach-sign "./ampdbin/ampd-$OS-$ARCH-$SEMVER"
fi
cgorenflo marked this conversation as resolved.
Show resolved Hide resolved

- name: Test Binary Format
working-directory: ./ampdbin
Expand Down Expand Up @@ -184,6 +189,7 @@ jobs:
cp -R ./ampdbin/. "./${version}/"
echo "release-dir=./${version}" >> $GITHUB_OUTPUT
echo "r2-destination-dir=./releases/ampd/" >> $GITHUB_OUTPUT


- uses: ryand56/r2-upload-action@latest
with:
Expand Down
11 changes: 11 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions ampd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ move-core-types = { git = "https:/mystenlabs/sui", tag = "mainnet-v1
multisig = { workspace = true, features = ["library"] }
multiversx-sdk = "0.4.1"
num-traits = { workspace = true }
openssl = { version = "0.10.35", features = ["vendored"] } # Needed to make arm compilation work by forcing vendoring
prost = "0.11.9"
prost-types = "0.11.9"
report = { workspace = true }
Expand Down
Loading