Skip to content

Commit 6feb3f9

Browse files
committed
Merge branch 'dev'
2 parents fbf5d45 + 1a0bf7e commit 6feb3f9

246 files changed

Lines changed: 14496 additions & 4714 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.convertor/convertor.cli.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/bppleman/Library/Mobile Documents/com~apple~CloudDocs/dotdir/convertor/convertor.cli.toml

.convertor/convertor.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/Users/bppleman/.convertor/convertor.toml
1+
/Users/bppleman/Library/Mobile Documents/com~apple~CloudDocs/dotdir/convertor/convertor.toml

.github/workflows/_build-shared.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ env:
2525
jobs:
2626
build-and-push:
2727
name: 构建多平台镜像并推送到 Harbor (${{ inputs.profile }})
28-
runs-on: [ self-hosted, macOS, ARM64 ]
28+
runs-on: [self-hosted, macOS, ARM64]
2929

3030
steps:
3131
- name: 检出代码
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333

3434
# 构建 builder 工具用于后续步骤
3535
- name: 构建 builder 工具
@@ -46,14 +46,14 @@ jobs:
4646
working-directory: dashboard
4747

4848
- name: 登录到 Harbor
49-
uses: docker/login-action@v3
49+
uses: docker/login-action@v4
5050
with:
5151
registry: ${{ env.REGISTRY }}
5252
username: ${{ env.REGISTRY_USERNAME }}
5353
password: ${{ env.REGISTRY_SECRET }}
5454

5555
- name: Set up Docker Buildx
56-
uses: docker/setup-buildx-action@v3
56+
uses: docker/setup-buildx-action@v4
5757
with:
5858
driver-opts: network=host
5959
config-inline: |
@@ -94,4 +94,3 @@ jobs:
9494
--dashboard \
9595
--registry ${{ env.REGISTRY }} \
9696
--user ${{ github.repository_owner }}
97-

.idea/convertor.iml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dictionaries/project.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.run/Run builder.run.xml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run builder" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
3-
<option name="command" value="run --package builder --bin builder"/>
4-
<option name="workingDirectory" value="file://$PROJECT_DIR$"/>
5-
<envs/>
6-
<option name="emulateTerminal" value="true"/>
7-
<option name="channel" value="DEFAULT"/>
8-
<option name="requiredFeatures" value="true"/>
9-
<option name="allFeatures" value="false"/>
10-
<option name="withSudo" value="false"/>
11-
<option name="buildTarget" value="REMOTE"/>
12-
<option name="backtrace" value="SHORT"/>
13-
<option name="isRedirectInput" value="false"/>
14-
<option name="redirectInputPath" value=""/>
15-
<method v="2">
16-
<option name="CARGO.BUILD_TASK_PROVIDER" enabled="true"/>
17-
</method>
18-
</configuration>
19-
</component>
2+
<configuration default="false" name="Run builder" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
3+
<option name="buildProfileId" value="dev" />
4+
<option name="command" value="run --package builder --bin builder" />
5+
<option name="workingDirectory" value="file://$PROJECT_DIR$" />
6+
<envs />
7+
<option name="emulateTerminal" value="true" />
8+
<option name="channel" value="DEFAULT" />
9+
<option name="requiredFeatures" value="true" />
10+
<option name="allFeatures" value="false" />
11+
<option name="withSudo" value="false" />
12+
<option name="buildTarget" value="REMOTE" />
13+
<option name="backtrace" value="SHORT" />
14+
<option name="isRedirectInput" value="false" />
15+
<option name="redirectInputPath" value="" />
16+
<method v="2">
17+
<option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
18+
</method>
19+
</configuration>
20+
</component>

.run/Test convertor.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Test convertor" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
33
<option name="buildProfileId" value="test" />
4-
<option name="command" value="test --package convertor --features testkit" />
4+
<option name="command" value="test --package convertor" />
55
<option name="workingDirectory" value="file://$PROJECT_DIR$" />
66
<envs />
77
<option name="emulateTerminal" value="true" />

0 commit comments

Comments
 (0)