Skip to content

Commit cf1e5ae

Browse files
committed
fix ci scripts
1 parent 070f97a commit cf1e5ae

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed
File renamed without changes.

.ci/linux/release

100644100755
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set -eou pipefail
1919

2020
source "$(cd "$(dirname $0)" && pwd)/../_shared.sh"
2121

22+
buildtarget=${BUILDTARGET:-}
2223
buildflags=${BUILDFLAGS:-}
2324
cargoflags=${CARGOFLAGS:-}
2425
rustflags=${RUSTFLAGS:-}
@@ -47,20 +48,20 @@ build() {
4748
noelware::startGroup "Build / Linux ($arch)"
4849

4950
echo "~> Performing compilation of binary \`hazel\`"
50-
echo " $ RUSTFLAGS=\"$RUSTFLAGS\" $cargo $cargoflags build --release --locked --bin hazel $buildflags"
51+
echo " $ RUSTFLAGS=\"$RUSTFLAGS\" $cargo $cargoflags build --release --locked --bin hazel --target $buildtarget $buildflags"
5152

52-
"$cargo $cargoflags build --release --locked --bin hazel $buildflags"
53+
"$cargo" $cargoflags build --release --locked --bin hazel --target $buildtarget $buildflags
5354
if [ $? -ne 0 ]; then
5455
exit $?
5556
fi
5657

5758
pushd "$root/.result" >/dev/null
5859

59-
echo "$ mv $root/target/$buildtarget/release/hazel $root/.result/hazel-darwin-$arch"
60-
mv "$root/target/$buildtarget/release/hazel" "$root/.result/hazel-darwin-$arch"
60+
echo "$ mv $root/target/$buildtarget/release/hazel $root/.result/hazel-linux-$arch"
61+
mv "$root/target/$buildtarget/release/hazel" "$root/.result/hazel-linux-$arch"
6162

6263
echo "Generating checksums for binary"
63-
shasum -a 256 "hazel-darwin-$arch" > ./"hazel-darwin-$arch.sha256"
64+
shasum -a 256 "hazel-linux-$arch" > ./"hazel-linux-$arch.sha256"
6465

6566
popd
6667

.ci/macos/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ build() {
5050
echo "~> Performing compilation of binary \`hazel\`"
5151
echo " $ RUSTFLAGS=\"$RUSTFLAGS\" $cargo $cargoflags build --release --locked --target $buildtarget --bin hazel $buildflags"
5252

53-
"$cargo $cargoflags build --release --locked --bin hazel $buildflags"
53+
"$cargo $cargoflags build --release --locked --bin hazel --target $buildtarget $buildflags"
5454
if [ $? -ne 0 ]; then
5555
exit $?
5656
fi

.github/workflows/Release.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ jobs:
111111
if: matrix.runner != 'windows-latest'
112112
run: .ci/${{contains(matrix.runner, 'apple-') && 'macos' || 'linux'}}/release
113113
env:
114-
BUILDFLAGS: "--target ${{matrix.target}} ${{matrix.buildflags}}"
114+
BUILDTARGET: ${{matrix.target}}
115+
BUILDFLAGS: ${{matrix.buildflags}}
115116
CARGOFLAGS: ${{env.CARGOFLAGS}}
116117
RUSTFLAGS: ${{matrix.rustflags}}
117118
CARGO: ${{matrix.cross && 'cross' || 'cargo'}}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@ config.toml
519519
!Cargo.lock
520520
!src/bin
521521
.direnv/
522+
.result/
522523
result
523524
.data/
524525
data/

0 commit comments

Comments
 (0)