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

chore(bin): rename mm2 binaries to kdf #2126

Merged
merged 7 commits into from
Jul 3, 2024
Merged

chore(bin): rename mm2 binaries to kdf #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bde2c1
rename mm2 binaries to kdf
shamardy May 24, 2024
3b9b575
rename mm2 to kdf in some scripts
shamardy May 24, 2024
92e4b16
build and deploy both mm2 and kdf named bins
shamardy May 24, 2024
f418593
add -r (recursive) option to cp command for wasm build jobs
shamardy May 24, 2024
d993eb9
for wasm provide only kdf named files
shamardy May 24, 2024
a1e288c
Update dev-release Dockerfile: replace 'mm2' with 'kdf'
shamardy May 28, 2024
fbb227f
Update releases Dockerfiles: ship mm2 binary into containers as well
shamardy May 28, 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
5 changes: 3 additions & 2 deletions .docker/Dockerfile.dev-release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM docker.io/debian:stable-slim
WORKDIR /mm2
WORKDIR /kdf
COPY target/release/kdf /usr/local/bin/kdf
Copy link
Member

Choose a reason for hiding this comment

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

Let's ship mm2 binary into containers as well:

Suggested change
COPY target/release/kdf /usr/local/bin/kdf
COPY target/release/kdf /usr/local/bin/kdf
COPY target/release/mm2 /usr/local/bin/mm2

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done

COPY target/release/mm2 /usr/local/bin/mm2
EXPOSE 7783
CMD ["mm2"]
CMD ["kdf"]
5 changes: 3 additions & 2 deletions .docker/Dockerfile.release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM docker.io/debian:stable-slim
WORKDIR /mm2
WORKDIR /kdf
COPY target/release/kdf /usr/local/bin/kdf
COPY target/release/mm2 /usr/local/bin/mm2
EXPOSE 7783
CMD ["mm2"]
CMD ["kdf"]
2 changes: 1 addition & 1 deletion .docker/Dockerfile.ubuntu.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ RUN \
chmod -R 777 /root

ENV PATH="/root/.cargo/bin:${PATH}"
WORKDIR /mm2
WORKDIR /kdf
4 changes: 4 additions & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ cmake-build-debug

!/target/release/mm2
!/target/debug/mm2
!/target/release/kdf
!/target/debug/kdf
/mm2src/*/target

/build
Expand All @@ -17,6 +19,8 @@ cmake-build-debug
/js/*.wasm
/js/mm2
/js/mm2.exe
/js/kdf
/js/kdf.exe
/wasm-build.log

# Opt out from history in order to speed the `COPY .` up.
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug report
about: Marketmaker 1.0 bug report
about: Komodo DeFi Framework bug report

---

Expand All @@ -9,10 +9,10 @@ A clear and concise description of what the bug is.

**Please answer following questions and attach requested info - it'll help to solve issue faster**
- What OS do you use?
- What marketmaker version do you run?
- What KDF version do you run?
- Attach your coins.json config.
- Provide your enable script with response.
- Provide other curl scripts (with responses) which were executed prior to error.
- Attach full marketmaker console logs (start collecting right after marketmaker execution).
- Attach full KDF console logs (start collecting right after KDF execution).
- ***Make sure that you don't send your passphrase, userpass and privkeys. Your funds might be stolen if you reveal this info publicly!***
- Provide info for all nodes involved (e.g. if error occurs during atomic swap you should provide info for both Bob and Alice).
97 changes: 82 additions & 15 deletions .github/workflows/dev-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ jobs:
run: |
rm -f ./MM_VERSION
echo $COMMIT_HASH > ./MM_VERSION
cargo build --bin mm2 --release
cargo build --release

- name: Compress build output
- name: Compress mm2 build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
Expand All @@ -65,6 +65,15 @@ jobs:
mkdir $BRANCH_NAME
mv $NAME ./$BRANCH_NAME/

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="kdf_$COMMIT_HASH-linux-x86-64.zip"
zip $NAME target/release/kdf -j
mv $NAME ./$BRANCH_NAME/

- name: Upload output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand Down Expand Up @@ -121,9 +130,9 @@ jobs:
run: |
rm -f ./MM_VERSION
echo $COMMIT_HASH > ./MM_VERSION
cargo build --bin mm2 --release --target x86_64-apple-darwin
cargo build --release --target x86_64-apple-darwin

- name: Compress build output
- name: Compress mm2 build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
Expand All @@ -133,6 +142,15 @@ jobs:
mkdir $BRANCH_NAME
mv $NAME ./$BRANCH_NAME/

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="kdf_$COMMIT_HASH-mac-x86-64.zip"
zip $NAME target/x86_64-apple-darwin/release/kdf -j
mv $NAME ./$BRANCH_NAME/

- name: Upload output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand Down Expand Up @@ -178,9 +196,9 @@ jobs:
remove-item "./MM_VERSION"
}
echo $Env:COMMIT_HASH > ./MM_VERSION
cargo build --bin mm2 --release
cargo build --release

- name: Compress build output
- name: Compress mm2 build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
Expand All @@ -190,6 +208,15 @@ jobs:
mkdir $Env:BRANCH_NAME
mv $NAME ./$Env:BRANCH_NAME/

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
$NAME="kdf_$Env:COMMIT_HASH-win-x86-64.zip"
7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
mv $NAME ./$Env:BRANCH_NAME/

- name: Upload output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand Down Expand Up @@ -236,17 +263,27 @@ jobs:
echo $COMMIT_HASH > ./MM_VERSION
cargo rustc --target x86_64-apple-darwin --lib --release --package mm2_bin_lib --crate-type=staticlib

- name: Compress build output
- name: Compress mm2 build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="mm2_$COMMIT_HASH-mac-dylib-x86-64.zip"
mv target/x86_64-apple-darwin/release/libmm2lib.a target/x86_64-apple-darwin/release/libmm2.a
cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
mkdir $BRANCH_NAME
mv $NAME ./$BRANCH_NAME/

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="kdf_$COMMIT_HASH-mac-dylib-x86-64.zip"
mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
mv $NAME ./$BRANCH_NAME/

- name: Upload output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand Down Expand Up @@ -310,7 +347,7 @@ jobs:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="mm2_$COMMIT_HASH-wasm.zip"
NAME="kdf_$COMMIT_HASH-wasm.zip"
(cd ./target/target-wasm-release && zip -r - .) > $NAME
mkdir $BRANCH_NAME
mv $NAME ./$BRANCH_NAME/
Expand Down Expand Up @@ -361,17 +398,27 @@ jobs:
echo $COMMIT_HASH > ./MM_VERSION
cargo rustc --target aarch64-apple-ios --lib --release --package mm2_bin_lib --crate-type=staticlib

- name: Compress build output
- name: Compress mm2 build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="mm2_$COMMIT_HASH-ios-aarch64.zip"
mv target/aarch64-apple-ios/release/libmm2lib.a target/aarch64-apple-ios/release/libmm2.a
cp target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
mkdir $BRANCH_NAME
mv $NAME ./$BRANCH_NAME/

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="kdf_$COMMIT_HASH-ios-aarch64.zip"
mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
mv $NAME ./$BRANCH_NAME/

- name: Upload output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand Down Expand Up @@ -432,17 +479,27 @@ jobs:
export PATH=$PATH:/android-ndk/bin
CC_aarch64_linux_android=aarch64-linux-android21-clang CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang cargo rustc --target=aarch64-linux-android --lib --release --crate-type=staticlib --package mm2_bin_lib

- name: Compress build output
- name: Compress mm2 build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="mm2_$COMMIT_HASH-android-aarch64.zip"
mv target/aarch64-linux-android/release/libmm2lib.a target/aarch64-linux-android/release/libmm2.a
cp target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
zip $NAME target/aarch64-linux-android/release/libmm2.a -j
mkdir $BRANCH_NAME
mv $NAME ./$BRANCH_NAME/

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="kdf_$COMMIT_HASH-android-aarch64.zip"
mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
zip $NAME target/aarch64-linux-android/release/libkdf.a -j
mv $NAME ./$BRANCH_NAME/

- name: Upload output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand Down Expand Up @@ -503,17 +560,27 @@ jobs:
export PATH=$PATH:/android-ndk/bin
CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang cargo rustc --target=armv7-linux-androideabi --lib --release --crate-type=staticlib --package mm2_bin_lib

- name: Compress build output
- name: Compress mm2 build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="mm2_$COMMIT_HASH-android-armv7.zip"
mv target/armv7-linux-androideabi/release/libmm2lib.a target/armv7-linux-androideabi/release/libmm2.a
cp target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
mkdir $BRANCH_NAME
mv $NAME ./$BRANCH_NAME/

- name: Compress kdf build output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
if: ${{ env.AVAILABLE != '' }}
run: |
NAME="kdf_$COMMIT_HASH-android-armv7.zip"
mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
mv $NAME ./$BRANCH_NAME/

- name: Upload output
env:
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
Expand Down
Loading
Loading