ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed Linux CI builds to static linking with Musl for better

Browse Source 
compatibility

Changed to tarball distribution for mac and linux

Updated upload-artifact to v4
This commit is contained in:
A1029384756
2024-09-08 18:35:16 -04:00
parent ddf5ca7adf
commit 036d7edda9
3 changed files with 106 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/nightly.yml
+65 -56
View File
@@ -36,43 +36,50 @@ jobs:
cp -r bin dist cp -r bin dist
cp -r examples dist cp -r examples dist
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v4
with: with:
name: windows_artifacts name: windows_artifacts
path: dist path: dist
build_ubuntu: build_linux:
name: Ubuntu Build name: Linux Build
if: github.repository == 'odin-lang/Odin' if: github.repository == 'odin-lang/Odin'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: jirutka/setup-alpine@v1
with:
branch: v3.20
- name: (Linux) Download LLVM - name: (Linux) Download LLVM
run: | run: |
wget https://apt.llvm.org/llvm.sh apk add --no-cache \
chmod +x llvm.sh musl-dev llvm18-dev clang18 git mold lz4 \
sudo ./llvm.sh 18 libxml2-static llvm18-static zlib-static zstd-static \
echo "/usr/lib/llvm-18/bin" >> $GITHUB_PATH make
shell: alpine.sh --root {0}
- name: build odin - name: build odin
run: make nightly # NOTE: this build does slow compile times because of musl
run: ci/build_linux_static.sh
shell: alpine.sh {0}
- name: Odin run - name: Odin run
run: ./odin run examples/demo run: ./odin run examples/demo
- name: Copy artifacts - name: Copy artifacts
run: | run: |
mkdir dist FILE="odin-linux-amd64-nightly+$(date -I)"
cp odin dist mkdir $FILE
cp LICENSE dist cp odin $FILE
cp -r shared dist cp LICENSE $FILE
cp -r base dist cp -r shared $FILE
cp -r core dist cp -r base $FILE
cp -r vendor dist cp -r core $FILE
cp -r examples dist cp -r vendor $FILE
# Zipping so executable permissions are retained, see https://github.com/actions/upload-artifact/issues/38 cp -r examples $FILE
zip -r dist.zip dist # Creating a tarball so executable permissions are retained, see https://github.com/actions/upload-artifact/issues/38
tar -czvf dist.tar.gz $FILE
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v4
with: with:
name: ubuntu_artifacts name: linux_artifacts
path: dist.zip path: dist.tar.gz
build_macos: build_macos:
name: MacOS Build name: MacOS Build
if: github.repository == 'odin-lang/Odin' if: github.repository == 'odin-lang/Odin'
@@ -89,24 +96,25 @@ jobs:
run: CXXFLAGS="-L/usr/lib/system -L/usr/lib" make nightly run: CXXFLAGS="-L/usr/lib/system -L/usr/lib" make nightly
- name: Bundle - name: Bundle
run: | run: |
mkdir dist FILE="odin-macos-amd64-nightly+$(date -I)"
cp odin dist mkdir $FILE
cp LICENSE dist cp odin $FILE
cp -r shared dist cp LICENSE $FILE
cp -r base dist cp -r shared $FILE
cp -r core dist cp -r base $FILE
cp -r vendor dist cp -r core $FILE
cp -r examples dist cp -r vendor $FILE
dylibbundler -b -x dist/odin -d dist/libs -od -p @executable_path/libs cp -r examples $FILE
# Zipping so executable permissions are retained, see https://github.com/actions/upload-artifact/issues/38 dylibbundler -b -x $FILE/odin -d $FILE/libs -od -p @executable_path/libs
zip -r dist.zip dist # Creating a tarball so executable permissions are retained, see https://github.com/actions/upload-artifact/issues/38
tar -czvf dist.tar.gz $FILE
- name: Odin run - name: Odin run
run: ./dist/odin run examples/demo run: ./dist/odin run examples/demo
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v4
with: with:
name: macos_artifacts name: macos_artifacts
path: dist.zip path: dist.tar.gz
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'
@@ -123,27 +131,28 @@ jobs:
run: CXXFLAGS="-L/usr/lib/system -L/usr/lib" make nightly run: CXXFLAGS="-L/usr/lib/system -L/usr/lib" make nightly
- name: Bundle - name: Bundle
run: | run: |
mkdir dist FILE="odin-macos-arm64-nightly+$(date -I)"
cp odin dist mkdir $FILE
cp LICENSE dist cp odin $FILE
cp -r shared dist cp LICENSE $FILE
cp -r base dist cp -r shared $FILE
cp -r core dist cp -r base $FILE
cp -r vendor dist cp -r core $FILE
cp -r examples dist cp -r vendor $FILE
dylibbundler -b -x dist/odin -d dist/libs -od -p @executable_path/libs cp -r examples $FILE
# Zipping so executable permissions are retained, see https://github.com/actions/upload-artifact/issues/38 dylibbundler -b -x $FILE/odin -d $FILE/libs -od -p @executable_path/libs
zip -r dist.zip dist # Creating a tarball so executable permissions are retained, see https://github.com/actions/upload-artifact/issues/38
tar -czvf dist.tar.gz $FILE
- name: Odin run - name: Odin run
run: ./dist/odin run examples/demo run: ./dist/odin run examples/demo
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v4
with: with:
name: macos_arm_artifacts name: macos_arm_artifacts
path: dist.zip path: dist.tar.gz
upload_b2: upload_b2:
runs-on: [ubuntu-latest] runs-on: [ubuntu-latest]
needs: [build_windows, build_macos, build_macos_arm, build_ubuntu] needs: [build_windows, build_macos, build_macos_arm, build_linux]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
@@ -160,22 +169,22 @@ jobs:
run: python -c "import sys; print(sys.version)" run: python -c "import sys; print(sys.version)"
- name: Download Windows artifacts - name: Download Windows artifacts
uses: actions/download-artifact@v1 uses: actions/download-artifact@v4
with: with:
name: windows_artifacts name: windows_artifacts
- name: Download Ubuntu artifacts - name: Download Ubuntu artifacts
uses: actions/download-artifact@v1 uses: actions/download-artifact@v4
with: with:
name: ubuntu_artifacts name: linux_artifacts
- name: Download macOS artifacts - name: Download macOS artifacts
uses: actions/download-artifact@v1 uses: actions/download-artifact@v4
with: with:
name: macos_artifacts name: macos_artifacts
- name: Download macOS arm artifacts - name: Download macOS arm artifacts
uses: actions/download-artifact@v1 uses: actions/download-artifact@v4
with: with:
name: macos_arm_artifacts name: macos_arm_artifacts
@@ -188,8 +197,8 @@ jobs:
DAYS_TO_KEEP: ${{ secrets.B2_DAYS_TO_KEEP }} DAYS_TO_KEEP: ${{ secrets.B2_DAYS_TO_KEEP }}
run: | run: |
python3 ci/nightly.py artifact windows-amd64 windows_artifacts/ python3 ci/nightly.py artifact windows-amd64 windows_artifacts/
python3 ci/nightly.py artifact ubuntu-amd64 ubuntu_artifacts/dist.zip python3 ci/nightly.py artifact linux-amd64 linux_artifacts/dist.tar.gz
python3 ci/nightly.py artifact macos-amd64 macos_artifacts/dist.zip python3 ci/nightly.py artifact macos-amd64 macos_artifacts/dist.tar.gz
python3 ci/nightly.py artifact macos-arm64 macos_arm_artifacts/dist.zip python3 ci/nightly.py artifact macos-arm64 macos_arm_artifacts/dist.tar.gz
python3 ci/nightly.py prune python3 ci/nightly.py prune
python3 ci/nightly.py json python3 ci/nightly.py json
ci/build_linux_static.sh
Executable
+19
View File
@@ -0,0 +1,19 @@
#!/usr/bin/env sh
# Intended for use in Alpine containers, see the "nightly" Github action for a list of dependencies
CXX="clang++-18"
LLVM_CONFIG="llvm-config-18"
DISABLED_WARNINGS="-Wno-switch -Wno-macro-redefined -Wno-unused-value"
CPPFLAGS="-DODIN_VERSION_RAW=\"dev-$(date +"%Y-%m")\""
CXXFLAGS="-std=c++14 $($LLVM_CONFIG --cxxflags --ldflags)"
LDFLAGS="-static -lm -lzstd -lz -lffi -pthread -ldl -fuse-ld=mold"
LDFLAGS="$LDFLAGS $($LLVM_CONFIG --link-static --ldflags --libs --system-libs --libfiles)"
LDFLAGS="$LDFLAGS -Wl,-rpath=\$ORIGIN"
EXTRAFLAGS="-DNIGHTLY -O3"
set -x
$CXX src/main.cpp src/libtommath.cpp $DISABLED_WARNINGS $CPPFLAGS $CXXFLAGS $EXTRAFLAGS $LDFLAGS -o odin
ci/nightly.py
+22 -17
View File
@@ -2,7 +2,7 @@ import os
import sys import sys
from zipfile import ZipFile, ZIP_DEFLATED from zipfile import ZipFile, ZIP_DEFLATED
from b2sdk.v2 import InMemoryAccountInfo, B2Api from b2sdk.v2 import InMemoryAccountInfo, B2Api
from datetime import datetime from datetime import datetime, UTC
import json import json
UPLOAD_FOLDER = "nightly/" UPLOAD_FOLDER = "nightly/"
@@ -22,7 +22,7 @@ def auth() -> bool:
pass # Not yet authenticated pass # Not yet authenticated
err = b2_api.authorize_account("production", application_key_id, application_key) err = b2_api.authorize_account("production", application_key_id, application_key)
return err == None return err is None
def get_bucket(): def get_bucket():
if not auth(): sys.exit(1) if not auth(): sys.exit(1)
@@ -32,30 +32,35 @@ def remove_prefix(text: str, prefix: str) -> str:
return text[text.startswith(prefix) and len(prefix):] return text[text.startswith(prefix) and len(prefix):]
def create_and_upload_artifact_zip(platform: str, artifact: str) -> int: def create_and_upload_artifact_zip(platform: str, artifact: str) -> int:
now = datetime.utcnow().replace(hour=0, minute=0, second=0, microsecond=0) now = datetime.now(UTC).replace(hour=0, minute=0, second=0, microsecond=0)
destination_zip_name = "odin-{}-nightly+{}.zip".format(platform, now.strftime("%Y-%m-%d"))
source_zip_name = artifact source_archive: str
if not artifact.endswith(".zip"): destination_name = f'odin-{platform}-nightly+{now.strftime("%Y-%m-%d")}'
print(f"Creating archive {destination_zip_name} from {artifact} and uploading to {bucket_name}")
source_zip_name = destination_zip_name if platform.startswith("linux") or platform.startswith("macos"):
with ZipFile(source_zip_name, mode='w', compression=ZIP_DEFLATED, compresslevel=9) as z: destination_name += ".tar.gz"
source_archive = artifact
else:
destination_name += ".zip"
source_archive = destination_name
print(f"Creating archive {destination_name} from {artifact} and uploading to {bucket_name}")
with ZipFile(source_archive, mode='w', compression=ZIP_DEFLATED, compresslevel=9) as z:
for root, directory, filenames in os.walk(artifact): for root, directory, filenames in os.walk(artifact):
for file in filenames: for file in filenames:
file_path = os.path.join(root, file) file_path = os.path.join(root, file)
zip_path = os.path.join("dist", os.path.relpath(file_path, artifact)) zip_path = os.path.join("dist", os.path.relpath(file_path, artifact))
z.write(file_path, zip_path) z.write(file_path, zip_path)
if not os.path.exists(source_zip_name): if not os.path.exists(source_archive):
print(f"Error: Newly created ZIP archive {source_zip_name} not found.") print(f"Error: Newly created ZIP archive {source_archive} not found.")
return 1 return 1
print("Uploading {} to {}".format(source_zip_name, UPLOAD_FOLDER + destination_zip_name)) print("Uploading {} to {}".format(source_archive, UPLOAD_FOLDER + destination_name))
bucket = get_bucket() bucket = get_bucket()
res = bucket.upload_local_file( res = bucket.upload_local_file(
source_zip_name, # Local file to upload source_archive, # Local file to upload
"nightly/" + destination_zip_name, # B2 destination path "nightly/" + destination_name, # B2 destination path
) )
return 0 return 0
@@ -66,7 +71,7 @@ def prune_artifacts():
for file, _ in bucket.ls(UPLOAD_FOLDER, latest_only=False): for file, _ in bucket.ls(UPLOAD_FOLDER, latest_only=False):
# Timestamp is in milliseconds # Timestamp is in milliseconds
date = datetime.fromtimestamp(file.upload_timestamp / 1_000.0).replace(hour=0, minute=0, second=0, microsecond=0) date = datetime.fromtimestamp(file.upload_timestamp / 1_000.0).replace(hour=0, minute=0, second=0, microsecond=0)
now = datetime.utcnow().replace(hour=0, minute=0, second=0, microsecond=0) now = datetime.now(UTC).replace(hour=0, minute=0, second=0, microsecond=0)
delta = now - date delta = now - date
if delta.days > int(days_to_keep): if delta.days > int(days_to_keep):
@@ -100,7 +105,7 @@ def update_nightly_json():
'sizeInBytes': size, 'sizeInBytes': size,
}) })
now = datetime.utcnow().isoformat() now = datetime.now(UTC).isoformat()
nightly = json.dumps({ nightly = json.dumps({
'last_updated' : now, 'last_updated' : now,
@@ -137,4 +142,4 @@ if __name__ == "__main__":
elif command == "json": elif command == "json":
res = update_nightly_json() res = update_nightly_json()
sys.exit(res) sys.exit(res)