File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -30,10 +30,11 @@ jobs:
3030 ref : main
3131 repository : cross-rs/cross
3232
33- - uses : actions/checkout@v4
33+ - name : clone cinnabar
34+ uses : actions/checkout@v4
3435 with :
35- repository : 2moe/glossa
36- path : glossa
36+ repository : 2moe/cinnabar
37+ path : cinnabar
3738
3839 - name : Login to GHCR
3940 uses : docker/login-action@v3
@@ -72,22 +73,30 @@ jobs:
7273
7374 - uses : actions/checkout@v4
7475 with :
75- repository : 2cd/pkgs
7676 path : pkgs
7777
7878 - name : tree
7979 run : " %w[tree -L 2].then(&run)"
8080
8181 - name : build & push docker image
8282 run : |
83- require_ci 'docker'
84- {
85- preset: nil,
86- create_manifest: false,
83+ require_ci 'compression'
84+ require_ci 'docker/build'
85+ require_ci 'docker/manifest'
86+
87+ cfg = {
88+ tag: 'cross-x64',
8789 os: 'linux',
8890 arch: 'x64',
89- tag : 'cross-x64 ',
90- file : 'pkgs/ci/cross.dockerfile',
91+ docker_repo : '{{env.ghcr_repo}} ',
92+ docker_file : 'pkgs/ci/cross.dockerfile',
9193 pkg_name: 'cross',
9294 suffix: '',
93- }.then { build_and_push_zstd_docker_image **_1 }
95+ }
96+
97+ [cfg, cfg.merge({pkg_name: 'cross-utils'})].each do |x|
98+ FileCompressor.new(x)
99+ .copy_cargo_target_file_to_docker_context_dir
100+ end
101+
102+ DockerBuild.new(x).build
Original file line number Diff line number Diff line change @@ -14,16 +14,16 @@ Thumbs.db:encryptable
1414
1515! /ci
1616! /.git *
17- # !/src
17+ ! /License
18+ ! /src
19+ ! /docs
1820# !/build.rs
1921# !/.rustfmt.toml
2022# !/rust-toolchain.toml
2123# !/.cargo
2224# !/Cargo.toml
2325# !/Cargo.lock
24- # !/License
2526# !/assets
26- # !/docs
2727# !/tests
2828# !/examples
2929# !/locales
You can’t perform that action at this time.
0 commit comments