Skip to content

Commit 0b24fcc

Browse files
authored
fix: reverts changes to release from upstream merge (#634)
1 parent baee07e commit 0b24fcc

File tree

1 file changed

+20
-31
lines changed

1 file changed

+20
-31
lines changed

.github/workflows/release.yml

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
env:
1212
CARGO_TERM_COLOR: always
1313
IS_NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
14-
PROFILE: maxperf
1514

1615
jobs:
1716
prepare:
@@ -136,69 +135,59 @@ jobs:
136135
- name: Build binaries
137136
env:
138137
SVM_TARGET_PLATFORM: ${{ matrix.svm_target_platform }}
139-
PLATFORM_NAME: ${{ matrix.platform }}
140-
TARGET: ${{ matrix.target }}
141-
OUT_DIR: target/${{ matrix.target }}/${{ env.PROFILE }}
142138
shell: bash
143139
run: |
144140
set -eo pipefail
145-
flags=(--target $TARGET --profile $PROFILE --bins
146-
--no-default-features --features rustls,aws-kms,cli,asm-keccak)
141+
target="${{ matrix.target }}"
142+
flags=()
147143
148-
# `jemalloc` is not fully supported on MSVC or aarch64 Linux.
149-
if [[ "$TARGET" != *msvc* && "$TARGET" != "aarch64-unknown-linux-gnu" ]]; then
150-
flags+=(--features jemalloc)
151-
fi
144+
# Disable asm-keccak, see https://github.com/alloy-rs/core/issues/711
145+
# # Remove jemalloc, only keep `asm-keccak` if applicable
146+
# if [[ "$target" != *msvc* && "$target" != "aarch64-unknown-linux-gnu" ]]; then
147+
# flags+=(--features asm-keccak)
148+
# fi
152149
153-
[[ "$TARGET" == *windows* ]] && ext=".exe"
154-
155-
cargo build "${flags[@]}"
150+
cargo build --release --bin forge --bin cast --target "$target" "${flags[@]}"
156151
157152
bins=(cast forge)
158153
for name in "${bins[@]}"; do
159-
bin=$OUT_DIR/$name$ext
160-
echo ""
161-
file "$bin" || true
162-
du -h "$bin" || true
163-
ldd "$bin" || true
164-
$bin --version || true
154+
bin=./target/$target/release/$name
155+
file "$bin" || true
156+
ldd "$bin" || true
157+
$bin --version || true
165158
done
166159
167160
- name: Archive binaries
168161
id: artifacts
169162
env:
170163
PLATFORM_NAME: ${{ matrix.platform }}
171-
OUT_DIR: target/${{ matrix.target }}/${{ env.PROFILE }}
172-
VERSION_NAME: ${{ (env.IS_NIGHTLY && 'nightly') || needs.prepare.outputs.tag_name }}
164+
TARGET: ${{ matrix.target }}
173165
ARCH: ${{ matrix.arch }}
166+
VERSION_NAME: ${{ (env.IS_NIGHTLY && 'nightly') || needs.prepare.outputs.tag_name }}
174167
shell: bash
175168
run: |
176169
if [ "$PLATFORM_NAME" == "linux" ]; then
177-
tar -czvf "foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C $OUT_DIR forge cast
170+
tar -czvf "foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release forge cast
178171
echo "file_name=foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
179172
elif [ "$PLATFORM_NAME" == "darwin" ]; then
180173
# We need to use gtar here otherwise the archive is corrupt.
181174
# See: https://github.com/actions/virtual-environments/issues/2619
182-
gtar -czvf "foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C $OUT_DIR forge cast
175+
gtar -czvf "foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release forge cast
183176
echo "file_name=foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
184-
else
185-
cd $OUT_DIR
186-
7z a -tzip "foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" forge.exe cast.exe
187-
mv "foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" ../../../
188-
echo "file_name=foundry_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" >> $GITHUB_OUTPUT
189177
fi
190178
191179
- name: Build man page
192180
id: man
193181
if: matrix.target == 'x86_64-unknown-linux-gnu'
194182
env:
195-
OUT_DIR: target/${{ matrix.target }}/${{ env.PROFILE }}
183+
PLATFORM_NAME: ${{ matrix.platform }}
184+
TARGET: ${{ matrix.target }}
196185
VERSION_NAME: ${{ (env.IS_NIGHTLY && 'nightly') || needs.prepare.outputs.tag_name }}
197186
shell: bash
198187
run: |
199188
sudo apt-get -y install help2man
200-
help2man -N $OUT_DIR/forge > forge.1
201-
help2man -N $OUT_DIR/cast > cast.1
189+
help2man -N ./target/${TARGET}/release/forge > forge.1
190+
help2man -N ./target/${TARGET}/release/cast > cast.1
202191
gzip forge.1
203192
gzip cast.1
204193
tar -czvf "foundry_man_${VERSION_NAME}.tar.gz" forge.1.gz cast.1.gz

0 commit comments

Comments
 (0)