Skip to content
This repository has been archived by the owner on Sep 15, 2024. It is now read-only.

Commit

Permalink
Merge branch 'enhancement-contrib-update' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ppenna committed Aug 11, 2024
2 parents 6cb47f4 + 1abcff8 commit 86a1799
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml → .github/workflows/x86-debug.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright(c) The Maintainers of Nanvix.
# Licensed under the MIT License.

name: Build
name: x86 Debug

on: push

Expand All @@ -23,8 +23,8 @@ jobs:
port: ${{ secrets.portnum }}
envs: TARGET_BRANCH
script: |
rm -rf allocator
git clone --recursive https://github.com/nanvix/allocator.git --branch ${TARGET_BRANCH}
rm -rf allocator-debug
git clone --recursive https://github.com/nanvix/allocator.git --branch ${TARGET_BRANCH} allocator-debug
build:
name: Build
Expand All @@ -40,8 +40,8 @@ jobs:
port: ${{ secrets.portnum }}
script: |
source "$HOME/.cargo/env"
cd allocator
cargo build --verbose
cd allocator-debug
cargo build
cleanup:
name: Cleanup
Expand All @@ -57,7 +57,7 @@ jobs:
key: ${{ secrets.sshkey }}
port: ${{ secrets.portnum }}
script: |
cd allocator
cd allocator-debug
git checkout --force dev
git clean -fdx
git remote prune origin
63 changes: 63 additions & 0 deletions .github/workflows/x86-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Copyright(c) The Maintainers of Nanvix.
# Licensed under the MIT License.

name: x86 Release

on: push

env:
TARGET_BRANCH: ${{ github.ref_name }}

jobs:

setup:
name: Setup
runs-on: ubuntu-latest
steps:
- name: Setup
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.hostname }}
username: ${{ secrets.username }}
key: ${{ secrets.sshkey }}
port: ${{ secrets.portnum }}
envs: TARGET_BRANCH
script: |
rm -rf allocator-release
git clone --recursive https://github.com/nanvix/allocator.git --branch ${TARGET_BRANCH} allocator-release
build:
name: Build
needs: setup
runs-on: ubuntu-latest
steps:
- name: Build
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.hostname }}
username: ${{ secrets.username }}
key: ${{ secrets.sshkey }}
port: ${{ secrets.portnum }}
script: |
source "$HOME/.cargo/env"
cd allocator-release
cargo build --release
cleanup:
name: Cleanup
needs: build
if: always()
runs-on: ubuntu-latest
steps:
- name: Cleanup
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.hostname }}
username: ${{ secrets.username }}
key: ${{ secrets.sshkey }}
port: ${{ secrets.portnum }}
script: |
cd allocator-release
git checkout --force dev
git clean -fdx
git remote prune origin
18 changes: 15 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[package]
name = "allocator"
version = "0.0.1"
version = "0.0.2"
license-file = "LICENSE.txt"
edition = "2021"
authors = ["The Maintainers of Nanvix"]
Expand All @@ -14,5 +14,17 @@ homepage = "https://github.com/nanvix"
crate-type = ["lib"]

[dependencies]
error = { git = "https://github.com/nanvix/error", branch = "releases/v0.0.1" }
slab = { git = "https://github.com/nanvix/slab", branch = "releases/v0.0.1" }
error = { git = "https://github.com/nanvix/error", branch = "releases/v0.0.2" }
slab = { git = "https://github.com/nanvix/slab", branch = "releases/v0.0.2" }

[profile.release]
opt-level = 3
debug = false
strip = "symbols"
debug-assertions = false
overflow-checks = true
lto = "fat"
panic = 'abort'
incremental = false
codegen-units = 1
rpath = false
2 changes: 1 addition & 1 deletion build

0 comments on commit 86a1799

Please sign in to comment.