ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-03 22:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3237 from laytan/macos-self-contained-releases

Browse Source 
fix releases being a zip of a zip
This commit is contained in:
gingerBill
2024-02-29 16:16:04 +00:00
committed by GitHub
parent 0a5c85f8e3 17b1c8d338
commit 88c97cbbd0
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/nightly.yml
+4 -4
View File
@@ -107,7 +107,7 @@ jobs:
build_macos_arm: build_macos_arm:
name: MacOS ARM Build name: MacOS ARM Build
if: github.repository == 'odin-lang/Odin' if: github.repository == 'odin-lang/Odin'
runs-on: macos-14 runs-on: macos-14 # ARM machine
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Download LLVM and setup PATH - name: Download LLVM and setup PATH
@@ -190,9 +190,9 @@ jobs:
echo Uploading artifcates to B2 echo Uploading artifcates to B2
chmod +x ./ci/upload_create_nightly.sh chmod +x ./ci/upload_create_nightly.sh
./ci/upload_create_nightly.sh "$BUCKET" windows-amd64 windows_artifacts/ ./ci/upload_create_nightly.sh "$BUCKET" windows-amd64 windows_artifacts/
./ci/upload_create_nightly.sh "$BUCKET" ubuntu-amd64 ubuntu_artifacts/ ./ci/upload_create_nightly.sh "$BUCKET" ubuntu-amd64 ubuntu_artifacts/dist.zip
./ci/upload_create_nightly.sh "$BUCKET" macos-amd64 macos_artifacts/ ./ci/upload_create_nightly.sh "$BUCKET" macos-amd64 macos_artifacts/dist.zip
./ci/upload_create_nightly.sh "$BUCKET" macos-arm64 macos_arm_artifacts/ ./ci/upload_create_nightly.sh "$BUCKET" macos-arm64 macos_arm_artifacts/dist.zip
echo Deleting old artifacts in B2 echo Deleting old artifacts in B2
python3 ci/delete_old_binaries.py "$BUCKET" "$DAYS_TO_KEEP" python3 ci/delete_old_binaries.py "$BUCKET" "$DAYS_TO_KEEP"
ci/upload_create_nightly.sh
Regular → Executable
+14 -2
View File
@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
bucket=$1 bucket=$1
platform=$2 platform=$2
artifact=$3 artifact=$3
@@ -9,5 +11,15 @@ filename="odin-$platform-nightly+$now.zip"
echo "Creating archive $filename from $artifact and uploading to $bucket" echo "Creating archive $filename from $artifact and uploading to $bucket"
7z a -bd "output/$filename" -r "$artifact" # If this is already zipped up (done before artifact upload to keep permissions in tact), just move it.
b2 upload-file --noProgress "$bucket" "output/$filename" "nightly/$filename" if [ "${artifact: -4}" == ".zip" ]
then
echo "Artifact already a zip"
mkdir -p "output"
mv "$artifact" "output/$filename"
else
echo "Artifact needs to be zipped"
7z a -bd "output/$filename" -r "$artifact"
fi
b2 upload-file --noProgress "$bucket" "output/$filename" "nightly/$filename"