Skip to content

Commit f25710f

Browse files
committed
Fixing hiveos integration
1 parent 2ff278a commit f25710f

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

.github/workflows/deploy.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,14 @@ jobs:
7676
- name: Build on MacOS
7777
if: matrix.os == 'macos-latest'
7878
run: |
79-
cargo build --target=x86_64-apple-darwin --release -p kaspa-miner -p kaspaopencl
79+
RUSTFLAGS="-framework OpenCL" cargo build --target=x86_64-apple-darwin --release -p kaspa-miner -p kaspaopencl
8080
asset_name="kaspa-miner-${{ github.event.release.tag_name }}-osx-amd64"
81-
mv ./target/x86_64-apple-darwin/release/kaspa-miner ${asset_name}
82-
echo "archive=${asset_name}" >> $GITHUB_ENV
83-
echo "asset_name=${asset_name}" >> $GITHUB_ENV
81+
mkdir ${asset_name}
82+
mv ./target/x86_64-apple-darwin/release/kaspa-miner ${asset_name}/${asset_name}
83+
mv ./target/x86_64-apple-darwin/release/libkaspa*.so ${asset_name}/
84+
tar czvf ${asset_name}.tgz ${asset_name}
85+
echo "archive=${asset_name}.tgz" >> $GITHUB_ENV
86+
echo "asset_name=${asset_name}.tgz" >> $GITHUB_ENV
8487
8588
8689
- name: Upload release asset
@@ -129,10 +132,10 @@ jobs:
129132
binary_name="kaspa-miner-${{ github.event.release.tag_name }}-linux-gnu-amd64"
130133
asset_name="kaspa-miner-${{ matrix.itegration }}"
131134
strip ./target/x86_64-unknown-linux-gnu/release/kaspa-miner
132-
mkdir ${asset_name}
133-
mv ./target/x86_64-unknown-linux-gnu/release/kaspa-miner ${asset_name}/${binary_name}
134-
mv ./target/x86_64-unknown-linux-gnu/release/libkaspa*.so ${asset_name}/
135-
bash integrations/${{ matrix.itegration }}/build.sh "${{ github.event.release.tag_name }}" "${binary_name}" "${asset_name}"
135+
mkdir kaspa-miner
136+
mv ./target/x86_64-unknown-linux-gnu/release/kaspa-miner kaspa-miner/${binary_name}
137+
mv ./target/x86_64-unknown-linux-gnu/release/libkaspa*.so kaspa-miner/
138+
bash integrations/${{ matrix.itegration }}/build.sh "${{ github.event.release.tag_name }}" "${binary_name}" kaspa-miner
136139
echo "archive=${asset_name}.tgz" >> $GITHUB_ENV
137140
echo "asset_name=${asset_name}.tgz" >> $GITHUB_ENV
138141

integrations/hiveos/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
integrations/hiveos/createmanifest.sh $1 $2
22
mkdir $3
33
cp h-manifest.conf integrations/hiveos/*.sh $2/* $3
4-
tar czvf $3.tgz $3
4+
tar czvf $3-hiveos.tgz $3

integrations/hiveos/createmanifest.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ CUSTOM_BUILD=0
3131
CUSTOM_MINERBIN=$2
3232
3333
# Full path to miner config file
34-
CUSTOM_CONFIG_FILENAME=/hive/miners/custom/$CUSTOM_NAME/config.ini
34+
CUSTOM_CONFIG_FILENAME=/hive/miners/custom/\$CUSTOM_NAME/config.ini
3535
3636
# Full path to log file basename. WITHOUT EXTENSION (don't include .log at the end)
3737
# Used to truncate logs and rotate,
3838
# E.g. /var/log/miner/mysuperminer/somelogname (filename without .log at the end)
39-
CUSTOM_LOG_BASENAME=/var/log/miner/$CUSTOM_NAME
39+
CUSTOM_LOG_BASENAME=/var/log/miner/\$CUSTOM_NAME
4040
4141
WEB_PORT=3338
42-
EOF
42+
EOF

0 commit comments

Comments
 (0)