Skip to content
This repository was archived by the owner on Aug 31, 2023. It is now read-only.

Commit c169406

Browse files
committed
splitting rustup target
1 parent c0db69d commit c169406

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

.github/workflows/release_cli.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- os: ubuntu-20.04
6060
target: x86_64-unknown-linux-gnu
6161
code-target: linux-x64
62-
container: quay.io/opencv-ci/opencv-python-manylinux2014_x86_64
62+
container: ghcr.io/rome/rome-ci-x86-64-centos7:latest
6363
- os: ubuntu-20.04
6464
target: aarch64-unknown-linux-gnu
6565
code-target: linux-arm64
@@ -88,17 +88,8 @@ jobs:
8888
with:
8989
fetch-depth: 1
9090

91-
- name: Install Node.js
92-
uses: actions/setup-node@v3
93-
with:
94-
node-version: 14.x
95-
96-
- name: Install Rustup
97-
uses: actions-rs/toolchain@v1
98-
with:
99-
toolchain: stable
100-
target: ${{ matrix.target }}
101-
default: true
91+
- name: Install Rust toolchain
92+
run: rustup target add ${{ matrix.target }}
10293

10394
- name: Install arm64 toolchain
10495
if: matrix.code-target == 'linux-arm64'
@@ -109,7 +100,6 @@ jobs:
109100
- name: Audit crates.io dependencies
110101
if: matrix.code-target == 'linux-x64'
111102
run: |
112-
cargo install cargo-audit
113103
cargo audit
114104
115105
# Build the CLI binary

.github/workflows/release_lsp.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ jobs:
8080
- os: ubuntu-20.04
8181
target: x86_64-unknown-linux-gnu
8282
code-target: linux-x64
83+
container: ghcr.io/rome/rome-ci-x86-64-centos7:latest
8384
- os: ubuntu-20.04
8485
target: aarch64-unknown-linux-gnu
8586
code-target: linux-arm64
86-
container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824
8787
- os: macos-11
8888
target: x86_64-apple-darwin
8989
code-target: darwin-x64
@@ -93,7 +93,9 @@ jobs:
9393

9494
name: Package ${{ matrix.code-target }}
9595
runs-on: ${{ matrix.os }}
96-
container: ${{ matrix.container }}
96+
container:
97+
image: ${{ matrix.container }}
98+
options: --user root
9799

98100
needs: check
99101
env:
@@ -106,17 +108,14 @@ jobs:
106108
prerelease: ${{ env.prerelease }}
107109

108110
steps:
111+
- name: Who Am I
112+
run: whoami
113+
109114
- name: Checkout repository
110115
uses: actions/checkout@v3
111116
with:
112117
fetch-depth: 1
113118

114-
- name: Install Rustup
115-
if: matrix.code-target == 'linux-x64'
116-
run: |
117-
which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
118-
source "$HOME/.cargo/env"
119-
120119
- name: Install Rust toolchain
121120
run: rustup target add ${{ matrix.target }}
122121

0 commit comments

Comments
 (0)