Skip to content

Commit

Permalink
Merge branch 'PKUHPC:master' into test-fork-pr
Browse files Browse the repository at this point in the history
  • Loading branch information
@ddadaal
ddadaal authored Oct 30, 2024
2 parents 9070796 + 39891d7 commit 9e1ef9a
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 37 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/test-build-publish.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ jobs:

build-images:
needs: test-version-packages
if: github.event.pull_request.head.repo.fork == false
runs-on: ubuntu-latest

permissions:
Expand Down Expand Up @@ -158,7 +159,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
${{ env.GITHUB_CR }}/${{ github.event.pull_request.head.repo.full_name }}/${{ matrix.name }}
${{ env.GITHUB_CR }}/${{ github.repository }}/${{ matrix.name }}
- name: Build and push Docker image
uses: docker/build-push-action@v6
Expand Down
24 changes: 15 additions & 9 deletions docs/docs/contribution/ci.dio
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<mxfile host="65bd71144e" scale="2" border="0">
<diagram id="CCmktOVLaJpoyg_8QXb8" name="Page-1">
<mxGraphModel dx="1292" dy="912" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<mxGraphModel dx="1014" dy="907" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
Expand All @@ -13,14 +13,17 @@
<mxCell id="22" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="2" target="21" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="26" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="2" target="25">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="2" value="代码更新&#10;(commit, PR)" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" parent="1" vertex="1">
<mxGeometry x="110" y="320" width="120" height="60" as="geometry"/>
<mxGeometry x="110" y="260" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="12" value="" style="edgeStyle=none;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontSize=18;labelBackgroundColor=none;" parent="1" source="4" target="11" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="4" value="构建文档" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" parent="1" vertex="1">
<mxGeometry x="280" y="260" width="120" height="60" as="geometry"/>
<mxGeometry x="280" y="280" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="9" value="" style="edgeStyle=none;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontSize=18;labelBackgroundColor=none;" parent="1" source="5" target="6" edge="1">
<mxGeometry relative="1" as="geometry"/>
Expand All @@ -40,25 +43,28 @@
<mxGeometry x="280" y="520" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="11" value="发布到&#10;GitHub Pages" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" parent="1" vertex="1">
<mxGeometry x="450" y="260" width="120" height="60" as="geometry"/>
<mxGeometry x="455" y="280" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="20" value="" style="edgeStyle=none;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontSize=18;labelBackgroundColor=none;" parent="1" source="13" target="17" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="13" value="构建镜像" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" parent="1" vertex="1">
<mxGeometry x="450" y="400" width="120" height="60" as="geometry"/>
<mxCell id="13" value="构建镜像&#10;（非fork的PR）" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" parent="1" vertex="1">
<mxGeometry x="450" y="400" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="17" value="上传镜像到GitHub CR" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" parent="1" vertex="1">
<mxGeometry x="610" y="400" width="120" height="60" as="geometry"/>
<mxGeometry x="640" y="400" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="24" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="21" target="23" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="21" value="构建二进制文件" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" parent="1" vertex="1">
<mxGeometry x="280" y="130" width="120" height="60" as="geometry"/>
<mxGeometry x="280" y="90" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="23" value="上传到CI Archive/Release" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" parent="1" vertex="1">
<mxGeometry x="450" y="130" width="140" height="60" as="geometry"/>
<mxGeometry x="450" y="90" width="140" height="60" as="geometry"/>
</mxCell>
<mxCell id="25" value="更新scow-vagrant" style="rounded=0;whiteSpace=wrap;fontSize=18;labelBackgroundColor=none;" vertex="1" parent="1">
<mxGeometry x="280" y="180" width="120" height="60" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
Expand Down
Binary file modified docs/docs/contribution/ci.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions docs/docs/contribution/dev.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,4 +193,7 @@ pnpm devenv:stop

![CI流程](./ci.png)

注意：

1. 针对来自非fork项目的PR，CI不会构建镜像以及更新scow-vagrant

4 changes: 4 additions & 0 deletions docs/docs/contribution/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ title: 贡献指南

![贡献流程](process.png)

注意事项：

1. 对于来自fork的仓库的PR，仓库的CI将会对您的代码运行测试，但是不会构建镜像。为了方便您自己以及团队的测试工作，我们推荐您首先在您的仓库中，发起一个您的分支到您仓库的master分支的PR。这个过程的CI将会运行在您的仓库中，将会构建镜像并上传到您的仓库的GitHub Container Registry中，您以及我们团队可以使用这些镜像进行测试。

## 开源协议

OpenSCOW在[木兰宽松许可证，第2版 (MulanPSL-2.0)](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=&ved=2ahUKEwir0N_4hPuIAxUinK8BHT7XBfIQFnoECBQQAQ&url=https%3A%2F%2Fspdx.org%2Flicenses%2FMulanPSL-2.0.html&usg=AOvVaw2pyvwh8sqZpV0XmHiRXQje&opi=89978449)下开源。您贡献的代码同样会在此协议下开源。
Expand Down
60 changes: 33 additions & 27 deletions docs/docs/contribution/process.dio
View file
Original file line number Diff line number Diff line change
@@ -1,92 +1,98 @@
<mxfile host="65bd71144e">
<diagram id="DShlPgOEDRtweNcWsppJ" name="Page-1">
<mxGraphModel dx="1420" dy="1019" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<mxGraphModel dx="1841" dy="907" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="6" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="4" target="5">
<mxCell id="6" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="4" target="5" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="4" value="" style="ellipse;fillColor=strokeColor;" vertex="1" parent="1">
<mxGeometry x="50" y="260" width="30" height="30" as="geometry"/>
<mxCell id="4" value="" style="ellipse;fillColor=strokeColor;" parent="1" vertex="1">
<mxGeometry x="-30" y="260" width="30" height="30" as="geometry"/>
</mxCell>
<mxCell id="8" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="5" target="7">
<mxCell id="8" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;startArrow=none;" parent="1" source="35" target="7" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="5" value="阅读并接受开源协议&lt;br&gt;（您）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" vertex="1" parent="1">
<mxGeometry x="120" y="255" width="140" height="40" as="geometry"/>
<mxCell id="37" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="5" target="35">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="5" value="阅读并接受开源协议&lt;br&gt;（您）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" parent="1" vertex="1">
<mxGeometry x="40" y="255" width="140" height="40" as="geometry"/>
</mxCell>
<mxCell id="13" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="7" target="12">
<mxCell id="13" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="7" target="12" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="14" value="否，或者不确定" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="13">
<mxCell id="14" value="否，或者不确定" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="13" vertex="1" connectable="0">
<mxGeometry x="-0.4123" y="1" relative="1" as="geometry">
<mxPoint x="13" y="9" as="offset"/>
</mxGeometry>
</mxCell>
<mxCell id="15" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="7" target="11">
<mxCell id="15" style="edgeStyle=none;html=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="7" target="11" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="16" value="是" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="15">
<mxCell id="16" value="是" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="15" vertex="1" connectable="0">
<mxGeometry x="0.2856" y="-1" relative="1" as="geometry">
<mxPoint x="-13" y="9" as="offset"/>
</mxGeometry>
</mxCell>
<mxCell id="7" value="是否只是小修改？" style="rhombus;" vertex="1" parent="1">
<mxGeometry x="288" y="250" width="126" height="50" as="geometry"/>
<mxCell id="7" value="是否只是小修改？" style="rhombus;" parent="1" vertex="1">
<mxGeometry x="340" y="250" width="126" height="50" as="geometry"/>
</mxCell>
<mxCell id="23" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="29" target="22">
<mxCell id="23" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="29" target="22" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="820" y="190" as="sourcePoint"/>
</mxGeometry>
</mxCell>
<mxCell id="32" value="接受修改" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="23">
<mxCell id="32" value="接受修改" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="23" vertex="1" connectable="0">
<mxGeometry x="-0.2866" y="1" relative="1" as="geometry">
<mxPoint as="offset"/>
</mxGeometry>
</mxCell>
<mxCell id="28" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="11" target="29">
<mxCell id="28" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="11" target="29" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="680" y="190" as="targetPoint"/>
</mxGeometry>
</mxCell>
<mxCell id="11" value="修改代码，创建PR&lt;br&gt;（您）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" vertex="1" parent="1">
<mxCell id="11" value="创建PR&lt;br&gt;（您）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" parent="1" vertex="1">
<mxGeometry x="470" y="170" width="140" height="40" as="geometry"/>
</mxCell>
<mxCell id="19" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="12" target="17">
<mxCell id="19" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="12" target="17" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="12" value="创建RFC issue&lt;br&gt;（您或者团队）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" vertex="1" parent="1">
<mxCell id="12" value="创建RFC issue&lt;br&gt;（您或者团队）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" parent="1" vertex="1">
<mxGeometry x="490" y="310" width="100" height="40" as="geometry"/>
</mxCell>
<mxCell id="33" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="17" target="21">
<mxCell id="33" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="17" target="21" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="17" value="讨论并确定终稿&lt;br&gt;（所有人）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" vertex="1" parent="1">
<mxCell id="17" value="讨论并确定终稿&lt;br&gt;（所有人）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" parent="1" vertex="1">
<mxGeometry x="620" y="310" width="110" height="40" as="geometry"/>
</mxCell>
<mxCell id="24" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="21">
<mxCell id="24" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="21" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="910" y="260" as="targetPoint"/>
</mxGeometry>
</mxCell>
<mxCell id="21" value="根据终稿实现&lt;br&gt;（您或者团队）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" vertex="1" parent="1">
<mxCell id="21" value="根据终稿实现&lt;br&gt;（您或者团队）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" parent="1" vertex="1">
<mxGeometry x="750" y="310" width="110" height="40" as="geometry"/>
</mxCell>
<mxCell id="22" value="" style="shape=sumEllipse;perimeter=ellipsePerimeter;whiteSpace=wrap;html=1;backgroundOutline=1;" vertex="1" parent="1">
<mxCell id="22" value="" style="shape=sumEllipse;perimeter=ellipsePerimeter;whiteSpace=wrap;html=1;backgroundOutline=1;" parent="1" vertex="1">
<mxGeometry x="910" y="240" width="30" height="30" as="geometry"/>
</mxCell>
<mxCell id="30" style="edgeStyle=none;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="29" target="12">
<mxCell id="30" style="edgeStyle=none;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="29" target="12" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="31" value="团队认为修改较大" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="30">
<mxCell id="31" value="团队认为修改较大" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="30" vertex="1" connectable="0">
<mxGeometry x="-0.0706" y="-1" relative="1" as="geometry">
<mxPoint y="1" as="offset"/>
</mxGeometry>
</mxCell>
<mxCell id="29" value="审核（团队）" style="rhombus;" vertex="1" parent="1">
<mxCell id="29" value="审核（团队）" style="rhombus;" parent="1" vertex="1">
<mxGeometry x="700" y="166.25" width="120" height="47.5" as="geometry"/>
</mxCell>
<mxCell id="35" value="fork仓库，进行修改&lt;br&gt;（您）" style="html=1;align=center;verticalAlign=top;rounded=1;absoluteArcSize=1;arcSize=10;dashed=0;" vertex="1" parent="1">
<mxGeometry x="200" y="255" width="120" height="40" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
</diagram>
Expand Down
Binary file modified docs/docs/contribution/process.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9e1ef9a

Please sign in to comment.