Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-03-10 13:09:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

build-universal updates to work with new aws s3 version of build-helper

Browse Source
This commit is contained in:
sawka 2024-01-17 20:04:27 -08:00
parent f8e2aadf98
commit 6ea70ff788
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-helper.yml vendored
View File

@ -88,12 +88,6 @@ jobs:
- run: | - run: |
mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip
- run: (cd buildtemp; zip ../waveterm-builds.zip *) - run: (cd buildtemp; zip ../waveterm-builds.zip *)
- run: date
- run: aws s3 ls s3://waveterm-github-artifacts/
env:
AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
AWS_DEFAULT_REGION: us-west-2
- run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/ - run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
env: env:
AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}" AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"

15
buildres/build-universal.sh
View File

@ -3,10 +3,19 @@
# assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory # assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory
VERSION=0.6.0 VERSION=0.6.0
rm -rf temp rm -rf temp
rm -rf builds
mkdir temp mkdir temp
mkdir temp/x64 mkdir temp/x64
X64_ZIP="Wave-darwin-x64-$VERSION.zip" aws s3 cp s3://waveterm-github-artifacts/waveterm-builds.zip .
ARM64_ZIP="Wave-darwin-arm64-$VERSION.zip" BUILDS_ZIP=waveterm-builds.zip
if ! [ -f $BUILDS_ZIP ]; then
echo "no $BUILDS_ZIP found";
exit 1;
fi
echo "unzipping $BUILDS_ZIP"
unzip -q $BUILDS_ZIP -d builds
X64_ZIP="builds/Wave-darwin-x64-$VERSION.zip"
ARM64_ZIP="builds/Wave-darwin-arm64-$VERSION.zip"
if ! [ -f $X64_ZIP ]; then if ! [ -f $X64_ZIP ]; then
echo "no $X64_ZIP found"; echo "no $X64_ZIP found";
exit 1; exit 1;
@ -48,4 +57,6 @@ DMG_NAME="waveterm-macos-universal-${DMG_VERSION}.dmg"
$DMG_NAME \ $DMG_NAME \
"temp/Wave.app" "temp/Wave.app"
echo "success, created $DMG_NAME" echo "success, created $DMG_NAME"
mv $DMG_NAME builds/
rm builds/Wave-darwin-*.zip
spctl -a -vvv -t install temp/Wave.app/ spctl -a -vvv -t install temp/Wave.app/