Skip to content

Commit

Permalink
Merge pull request #811 from genedna/main
Browse files Browse the repository at this point in the history
Add pre task of r2cn issue template and remove mega and aries from Docker Hub Build Cloud
  • Loading branch information
benjamin-747 authored Jan 25, 2025
2 parents ebf50c0 + f2e45cd commit 9a5a4f8
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 67 deletions.
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/pre-task.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: pre-task
about: r2cn 测试任务模板
title: "[libra] "
labels: pre-task libra
assignees: ''

---

[任务简述] Libra XXX 命令实现 YYY 参数

[具体描述] XXX 命令 YYY 参数的具体功能描述

[实现方案]

[测试用例]

[实现方案]
27 changes: 14 additions & 13 deletions .github/ISSUE_TEMPLATE/r2cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,27 @@ assignees: ''

---

[标题] 为xxx实现xxx功能
[任务]

[任务分值] xx分(根据任务分级自评)
[任务分值] 4 分

[背景描述] 描述产品及特性
[背景描述]

[需求描述] 目前需要开发的特性
[需求描述]

[环境要求] 描述开发环境
[代码标准]

[产出标准] xxx
1. 所有 PR 提交必须签署 `Signed-off-by` 和 使用 `GPG` 签名,即提交代码时(使用 `git commit` 命令时)至少使用 `-s -S` 两个参数;
2. 所有 PR 提交必须通过 `GitHub Actions` 自动化测试;
3. PR 提交内容和代码注释均需要使用英文;

[PR 提交地址] 仓库xxx分支的xxx目录
[PR 提交地址] 提交到 [mega](https://github.com/web3infra-foundation/mega) 仓库的 `main` 分支

[期望完成时间] 202x年xx月xx日
[开发指导]

[开发指导] 参考资料等
[导师及邮箱] 请申请此题目的同学使用邮件联系导师,或加入到 [R2CN Discord](https://discord.gg/WRp4TKv6rh) 后在 `#p-meta` 频道和导师交流。

[导师及邮箱] YYY <[email protected]>
1. Quanyi Ma <[email protected]>
2. Tianxing Ye <[email protected]>

[备注] xxx

[标签] r2cn
[备注]
50 changes: 0 additions & 50 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,53 +79,3 @@ jobs:
# For pull requests, export results to the build cache.
# Otherwise, push to a registry.
outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry' }}
aries:
runs-on: ubuntu-latest
if: github.repository_owner == 'genedna'
steps:
- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ vars.DOCKER_USER }}
password: ${{ secrets.DOCKER_PAT }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: "lab:latest"
driver: cloud
endpoint: "${{ vars.DOCKER_USER }}/mono"
platforms: linux/amd64,linux/arm64
install: true
- name: Build and push
uses: docker/build-push-action@v6
with:
tags: "${{ vars.DOCKER_USER }}/mono:aries-engine-latest"
file: docker/aries-engine-dockerfile-hub
# For pull requests, export results to the build cache.
# Otherwise, push to a registry.
outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry' }}
mega:
runs-on: ubuntu-latest
if: github.repository_owner == 'genedna'
steps:
- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ vars.DOCKER_USER }}
password: ${{ secrets.DOCKER_PAT }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: "lab:latest"
driver: cloud
endpoint: "${{ vars.DOCKER_USER }}/mono"
platforms: linux/amd64,linux/arm64
install: true
- name: Build and push
uses: docker/build-push-action@v6
with:
tags: "${{ vars.DOCKER_USER }}/mono:mega-engine-latest"
file: docker/mega-engine-dockerfile-hub
# For pull requests, export results to the build cache.
# Otherwise, push to a registry.
outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry' }}
8 changes: 4 additions & 4 deletions scorpio/src/overlayfs/layer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub trait Layer: Filesystem {
async fn create_whiteout(&self, ctx: Request, parent: Inode, name: &OsStr) -> Result<ReplyEntry> {
// Use temp value to avoid moved 'parent'.
let ino: u64 = parent;
match self.lookup(ctx, ino, name).await {//FXIME: errir
match self.lookup(ctx, ino, name).await {//FXIME: errir
Ok(v) => {
// Find whiteout char dev.
if is_whiteout(&v.attr) {
Expand All @@ -46,7 +46,7 @@ pub trait Layer: Filesystem {
}
None => return Err(e.into()),
}

},
}

Expand Down Expand Up @@ -126,15 +126,15 @@ pub trait Layer: Filesystem {
return Err(Error::from_raw_os_error(libc::ENOTDIR).into());
}


// Return Result<is_opaque>.
let check_attr = |inode: Inode, attr_name: &'static str, attr_size: u32| async move {
let cname = OsStr::new(attr_name);
match self.getxattr(ctx, inode, cname, attr_size).await {
Ok(v) => {
// xattr name exists and we get value.
if let ReplyXAttr::Data(bufs) = v {
if bufs.len() == 1 && bufs[0].to_ascii_lowercase() == b'y' {
if bufs.len() == 1 && bufs[0].eq_ignore_ascii_case(&b'y') {
return Ok(true);
}
}
Expand Down

1 comment on commit 9a5a4f8

@vercel
Copy link

@vercel vercel bot commented on 9a5a4f8 Jan 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

mega – ./

mega-git-main-gitmono.vercel.app
www.gitmega.dev
mega-gitmono.vercel.app
gitmega.dev

Please sign in to comment.