diff --git a/.github/workflows/build-helper.yml b/.github/workflows/build-helper.yml index be992c55..374f4c35 100644 --- a/.github/workflows/build-helper.yml +++ b/.github/workflows/build-helper.yml @@ -88,12 +88,6 @@ jobs: - run: | 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: 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/ env: AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}" diff --git a/buildres/build-universal.sh b/buildres/build-universal.sh index a8805e80..1a16f9ce 100644 --- a/buildres/build-universal.sh +++ b/buildres/build-universal.sh @@ -3,10 +3,19 @@ # assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory VERSION=0.6.0 rm -rf temp +rm -rf builds mkdir temp mkdir temp/x64 -X64_ZIP="Wave-darwin-x64-$VERSION.zip" -ARM64_ZIP="Wave-darwin-arm64-$VERSION.zip" +aws s3 cp s3://waveterm-github-artifacts/waveterm-builds.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 echo "no $X64_ZIP found"; exit 1; @@ -48,4 +57,6 @@ DMG_NAME="waveterm-macos-universal-${DMG_VERSION}.dmg" $DMG_NAME \ "temp/Wave.app" echo "success, created $DMG_NAME" +mv $DMG_NAME builds/ +rm builds/Wave-darwin-*.zip spctl -a -vvv -t install temp/Wave.app/