From e5c335adcda6cf1feb9471782b3494385ee1e5de Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Thu, 10 Nov 2022 11:58:49 -0300 Subject: [PATCH 01/11] build rome using older glibc --- .github/workflows/release_cli.yml | 3 +++ .github/workflows/release_lsp.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index 346f2fc67e4..b6d3a180681 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -59,9 +59,11 @@ jobs: - os: ubuntu-20.04 target: x86_64-unknown-linux-gnu code-target: linux-x64 + container: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64 - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 + container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64 - os: macos-11 target: x86_64-apple-darwin code-target: darwin-x64 @@ -71,6 +73,7 @@ jobs: name: Package ${{ matrix.code-target }} runs-on: ${{ matrix.os }} + container: ${{ matrix.container }} needs: check if: needs.check.outputs.version_changed == 'true' || needs.check.outputs.nightly == 'true' diff --git a/.github/workflows/release_lsp.yml b/.github/workflows/release_lsp.yml index ba4b2fe1a1a..b2881f6fe50 100644 --- a/.github/workflows/release_lsp.yml +++ b/.github/workflows/release_lsp.yml @@ -80,9 +80,11 @@ jobs: - os: ubuntu-20.04 target: x86_64-unknown-linux-gnu code-target: linux-x64 + container: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64 - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 + container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64 - os: macos-11 target: x86_64-apple-darwin code-target: darwin-x64 @@ -92,6 +94,7 @@ jobs: name: Package ${{ matrix.code-target }} runs-on: ${{ matrix.os }} + container: ${{ matrix.container }} needs: check env: From 5ee582bdf276ec0edd3853027982629d1ebff5dd Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Thu, 10 Nov 2022 13:00:53 -0300 Subject: [PATCH 02/11] fix aarch64 tag --- .github/workflows/release_cli.yml | 2 +- .github/workflows/release_lsp.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index b6d3a180681..ae906191271 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -63,7 +63,7 @@ jobs: - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 - container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64 + container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824 - os: macos-11 target: x86_64-apple-darwin code-target: darwin-x64 diff --git a/.github/workflows/release_lsp.yml b/.github/workflows/release_lsp.yml index b2881f6fe50..f32d29283c6 100644 --- a/.github/workflows/release_lsp.yml +++ b/.github/workflows/release_lsp.yml @@ -84,7 +84,7 @@ jobs: - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 - container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64 + container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824 - os: macos-11 target: x86_64-apple-darwin code-target: darwin-x64 From 3a1ad0f18f5b12d10d33318d6e62c9d04f102ab5 Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Thu, 10 Nov 2022 13:04:30 -0300 Subject: [PATCH 03/11] fix x86_x64 container name --- .github/workflows/release_cli.yml | 2 +- .github/workflows/release_lsp.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index ae906191271..d697e9e1146 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -59,7 +59,7 @@ jobs: - os: ubuntu-20.04 target: x86_64-unknown-linux-gnu code-target: linux-x64 - container: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64 + container: quay.io/opencv-ci/opencv-python-manylinux2014_x86_64 - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 diff --git a/.github/workflows/release_lsp.yml b/.github/workflows/release_lsp.yml index f32d29283c6..61dd4861c0e 100644 --- a/.github/workflows/release_lsp.yml +++ b/.github/workflows/release_lsp.yml @@ -80,7 +80,7 @@ jobs: - os: ubuntu-20.04 target: x86_64-unknown-linux-gnu code-target: linux-x64 - container: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64 + container: quay.io/opencv-ci/opencv-python-manylinux2014_x86_64 - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 From 9f7164b765ffdcb2326944f4a70bf7ddfa4b2ac0 Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Thu, 10 Nov 2022 13:15:40 -0300 Subject: [PATCH 04/11] install rustup --- .github/workflows/release_cli.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index d697e9e1146..708c6b59f51 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -94,6 +94,10 @@ jobs: with: node-version: 14.x + - name: Install Rustup + if: matrix.code-target == 'linux-x64' || matrix.code-target == 'linux-arm64' + run: which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + - name: Install Rust toolchain run: rustup target add ${{ matrix.target }} From 5cebc41e3be50aae616615755ab64e6094a1a70f Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Thu, 10 Nov 2022 13:21:02 -0300 Subject: [PATCH 05/11] ignoring arm64 for the moment --- .github/workflows/release_cli.yml | 3 +-- .github/workflows/release_lsp.yml | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index 708c6b59f51..d066720c6be 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -63,7 +63,6 @@ jobs: - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 - container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824 - os: macos-11 target: x86_64-apple-darwin code-target: darwin-x64 @@ -95,7 +94,7 @@ jobs: node-version: 14.x - name: Install Rustup - if: matrix.code-target == 'linux-x64' || matrix.code-target == 'linux-arm64' + if: matrix.code-target == 'linux-x64' run: which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - name: Install Rust toolchain diff --git a/.github/workflows/release_lsp.yml b/.github/workflows/release_lsp.yml index 61dd4861c0e..5c77ac4abee 100644 --- a/.github/workflows/release_lsp.yml +++ b/.github/workflows/release_lsp.yml @@ -80,7 +80,6 @@ jobs: - os: ubuntu-20.04 target: x86_64-unknown-linux-gnu code-target: linux-x64 - container: quay.io/opencv-ci/opencv-python-manylinux2014_x86_64 - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 @@ -112,6 +111,10 @@ jobs: with: fetch-depth: 1 + - name: Install Rustup + if: matrix.code-target == 'linux-x64' + run: which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + - name: Install Rust toolchain run: rustup target add ${{ matrix.target }} From 5e5f2310c1f1e32949fe0d80335a588659647374 Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Thu, 10 Nov 2022 13:25:55 -0300 Subject: [PATCH 06/11] sourcing rust env variables --- .github/workflows/release_lsp.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_lsp.yml b/.github/workflows/release_lsp.yml index 5c77ac4abee..68086ec8651 100644 --- a/.github/workflows/release_lsp.yml +++ b/.github/workflows/release_lsp.yml @@ -113,8 +113,10 @@ jobs: - name: Install Rustup if: matrix.code-target == 'linux-x64' - run: which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - + run: | + which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source "$HOME/.cargo/env" + - name: Install Rust toolchain run: rustup target add ${{ matrix.target }} From b77bb72830706c7d3c7315786cee5709ae500978 Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Thu, 10 Nov 2022 13:29:28 -0300 Subject: [PATCH 07/11] sourcing rust env variables --- .github/workflows/release_cli.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index d066720c6be..d540d16486b 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -95,8 +95,10 @@ jobs: - name: Install Rustup if: matrix.code-target == 'linux-x64' - run: which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - + run: | + which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source "$HOME/.cargo/env" + - name: Install Rust toolchain run: rustup target add ${{ matrix.target }} From eac62857e5884a48eed12fed6347dd500c085b80 Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Fri, 11 Nov 2022 06:31:11 -0300 Subject: [PATCH 08/11] using toolchain action --- .github/workflows/release_cli.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index d540d16486b..9671f80fb41 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -94,14 +94,12 @@ jobs: node-version: 14.x - name: Install Rustup + uses: actions-rs/toolchain@v1 if: matrix.code-target == 'linux-x64' - run: | - which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source "$HOME/.cargo/env" + with: + target: ${{ matrix.target }} + default: true - - name: Install Rust toolchain - run: rustup target add ${{ matrix.target }} - - name: Install arm64 toolchain if: matrix.code-target == 'linux-arm64' run: | From 5a0b764af66e2af3ddcb7224359aac9b5a9351bc Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Fri, 11 Nov 2022 06:34:22 -0300 Subject: [PATCH 09/11] missing required toolchain --- .github/workflows/release_cli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index 9671f80fb41..2f976f71530 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -95,8 +95,8 @@ jobs: - name: Install Rustup uses: actions-rs/toolchain@v1 - if: matrix.code-target == 'linux-x64' with: + toolchain: stable target: ${{ matrix.target }} default: true From c0db69dd7606cb70ee4aaf192367355958212228 Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Fri, 11 Nov 2022 06:39:17 -0300 Subject: [PATCH 10/11] install cargo audit --- .github/workflows/release_cli.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index 2f976f71530..59c6d53d1c4 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -108,7 +108,9 @@ jobs: - name: Audit crates.io dependencies if: matrix.code-target == 'linux-x64' - run: cargo audit + run: | + cargo install cargo-audit + cargo audit # Build the CLI binary - name: Build binaries From 5b88d54c96ecb467f22a9618619dc6e5edaecb1d Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Fri, 11 Nov 2022 06:45:33 -0300 Subject: [PATCH 11/11] splitting rustup target --- .github/workflows/release_cli.yml | 24 ++++++++++-------------- .github/workflows/release_lsp.yml | 15 +++++++-------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index 59c6d53d1c4..69b75431d11 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -59,7 +59,7 @@ jobs: - os: ubuntu-20.04 target: x86_64-unknown-linux-gnu code-target: linux-x64 - container: quay.io/opencv-ci/opencv-python-manylinux2014_x86_64 + container: ghcr.io/rome/rome-ci-x86-64-centos7:latest - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 @@ -72,7 +72,10 @@ jobs: name: Package ${{ matrix.code-target }} runs-on: ${{ matrix.os }} - container: ${{ matrix.container }} + container: + image: ${{ matrix.container }} + env: + PATH: /root/.cargo/bin:/root/.nvm/versions/node/v14.21.1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/bin needs: check if: needs.check.outputs.version_changed == 'true' || needs.check.outputs.nightly == 'true' @@ -83,22 +86,16 @@ jobs: prerelease: ${{ needs.check.outputs.prerelease }} steps: + - name: Who Am I + run: whoami && printenv + - name: Checkout repository uses: actions/checkout@v3 with: fetch-depth: 1 - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 14.x - - - name: Install Rustup - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.target }} - default: true + - name: Install Rust toolchain + run: rustup target add ${{ matrix.target }} - name: Install arm64 toolchain if: matrix.code-target == 'linux-arm64' @@ -109,7 +106,6 @@ jobs: - name: Audit crates.io dependencies if: matrix.code-target == 'linux-x64' run: | - cargo install cargo-audit cargo audit # Build the CLI binary diff --git a/.github/workflows/release_lsp.yml b/.github/workflows/release_lsp.yml index 68086ec8651..81f2da66ae8 100644 --- a/.github/workflows/release_lsp.yml +++ b/.github/workflows/release_lsp.yml @@ -80,10 +80,10 @@ jobs: - os: ubuntu-20.04 target: x86_64-unknown-linux-gnu code-target: linux-x64 + container: ghcr.io/rome/rome-ci-x86-64-centos7:latest - os: ubuntu-20.04 target: aarch64-unknown-linux-gnu code-target: linux-arm64 - container: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824 - os: macos-11 target: x86_64-apple-darwin code-target: darwin-x64 @@ -93,7 +93,9 @@ jobs: name: Package ${{ matrix.code-target }} runs-on: ${{ matrix.os }} - container: ${{ matrix.container }} + container: + image: ${{ matrix.container }} + options: --user root needs: check env: @@ -106,17 +108,14 @@ jobs: prerelease: ${{ env.prerelease }} steps: + - name: Who Am I + run: whoami + - name: Checkout repository uses: actions/checkout@v3 with: fetch-depth: 1 - - name: Install Rustup - if: matrix.code-target == 'linux-x64' - run: | - which rustup || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source "$HOME/.cargo/env" - - name: Install Rust toolchain run: rustup target add ${{ matrix.target }}