Skip to content

Commit ee8379c

Browse files
committed
Merge: update branch
Signed-off-by: AidCheng <cn.aiden.cheng@gmail.com>
2 parents 43a8f7f + f67eaf2 commit ee8379c

98 files changed

Lines changed: 5557 additions & 758 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.

.dockerignore

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
# Generated by Cargo
22
# will have compiled files and executables
3+
target
34
**/target/
45
# Keep Cargo.lock in build context for reproducible + cache-friendly builds.
56

7+
moon
8+
moon/**
9+
10+
docs
11+
12+
scripts
13+
14+
tests
15+
616
# These are backup files generated by rustfmt
717
**/*.rs.bk
818

@@ -28,9 +38,7 @@ ztm_agent_db*
2838
buck-out
2939

3040
# Dockderfile
31-
docker/mono-engine-dockerfile
32-
docker/mono-pg-dockerfile
33-
docker/aries-engine-dockerfile
41+
docker
3442

3543
# git / ci metadata (not needed for docker builds, reduces build context)
3644
.git/

.github/workflows/base.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ jobs:
118118
119119
fuse:
120120
name: Fuse Clippy Check
121-
if: ${{ github.repository == 'web3infra-foundation/mega' }}
122121
runs-on: [self-hosted, Linux, X64]
123122
env:
124123
CARGO_TERM_COLOR: always

.github/workflows/mono-engine-deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ concurrency:
3535

3636
jobs:
3737
build-push-single-arch:
38-
if: ${{ github.repository == 'web3infra-foundation/mega' }}
3938
runs-on: ubuntu-latest
4039
strategy:
4140
matrix:

.github/workflows/orion-client-deploy.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
jobs:
16-
build-and-deploy:
16+
build:
1717
if: ${{ github.repository == 'web3infra-foundation/mega' }}
1818
runs-on: ubuntu-latest
1919
timeout-minutes: 20
@@ -44,11 +44,30 @@ jobs:
4444
file target/release/orion || true
4545
file target/release/scorpio || true
4646
47+
- name: Upload build artifacts
48+
uses: actions/upload-artifact@v4
49+
with:
50+
name: orion-scorpio-bins
51+
path: |
52+
target/release/orion
53+
target/release/scorpio
54+
55+
deploy:
56+
if: ${{ github.repository == 'web3infra-foundation/mega' }}
57+
runs-on: ubuntu-latest
58+
needs: build
59+
steps:
60+
- name: Download build artifacts
61+
uses: actions/download-artifact@v4
62+
with:
63+
name: orion-scorpio-bins
64+
path: ./artifacts
65+
4766
- name: Upload binaries via rsync
4867
uses: burnett01/rsync-deployments@master
4968
with:
5069
switches: -avz --progress
51-
path: target/release/orion target/release/scorpio
70+
path: artifacts/orion artifacts/scorpio
5271
remote_path: /root/orion-runner/
5372
remote_host: ${{ secrets.ORION_DEPLOY_HOST }}
5473
remote_user: root

.github/workflows/orion-client-image-deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ env:
3131

3232
jobs:
3333
build-push-single-arch:
34-
if: ${{ github.repository == 'web3infra-foundation/mega' }}
3534
runs-on: ubuntu-latest
3635
strategy:
3736
matrix:

.github/workflows/orion-server-deploy.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ concurrency:
2424

2525
jobs:
2626
build-push-single-arch:
27-
if: ${{ github.repository == 'web3infra-foundation/mega' }}
2827
runs-on: ubuntu-latest
2928
strategy:
3029
matrix:
@@ -71,7 +70,6 @@ jobs:
7170
manifest:
7271
needs: build-push-single-arch
7372
runs-on: ubuntu-latest
74-
if: ${{ github.repository == 'web3infra-foundation/mega' }}
7573
permissions:
7674
contents: read
7775
steps:

.github/workflows/web-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ jobs:
124124
125125
deploy:
126126
needs: manifest
127+
if: ${{ github.repository == 'web3infra-foundation/mega' }}
127128
runs-on: ubuntu-latest
128129
permissions:
129130
contents: read

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,7 @@ monobean/resources/lib
5151
# orion server test
5252
orion-server/test_targets.sh
5353
orion-server/test-artifacts/
54-
orion-server/docker-compose.override.yml
54+
orion-server/docker-compose.override.yml
55+
56+
# local dev environment
57+
/scripts/dev/.env

0 commit comments

Comments
 (0)